Permalink
Browse files

Revert "Testing back ports from the quake3 port"

This reverts commit 796e4e3.
  • Loading branch information...
1 parent d792ae7 commit 8c7dcf1e58ab3a50b53de0c7cecb98b3752b3ca5 @reefab committed Jul 11, 2012
Showing with 0 additions and 32 deletions.
  1. +0 −24 src/egl/eglport.c
  2. +0 −8 src/refresh/header/qgl_linked.h
View
24 src/egl/eglport.c
@@ -417,8 +417,6 @@ int8_t FindAppropriateEGLConfigs( void )
ConfigAttribs[attrib++] = 0;
ConfigAttribs[attrib++] = EGL_RENDERABLE_TYPE;
ConfigAttribs[attrib++] = EGL_OPENGL_ES2_BIT;
- ConfigAttribs[attrib++] = EGL_SAMPLE_BUFFERS;
- ConfigAttribs[attrib++] = 1;
ConfigAttribs[attrib++] = EGL_NONE;
#else
ConfigAttribs[attrib++] = EGL_RED_SIZE;
@@ -551,26 +549,4 @@ void myglClear(GLbitfield mask)
firstclear = 0;
}
}
-
-void myglTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
- static int opaque = 0;
-
- if (format == GL_RGB && type == GL_UNSIGNED_BYTE) {
- assert(level == 0);
- opaque = 1;
-
- etc1_compress_tex_image(target, level, format, width, height, border, format, type, pixels);
- } else if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
- if (level == 0)
- opaque = isopaque(width, height, pixels);
-
- if (opaque)
- etc1_compress_tex_image(target, level, format, width, height, border, format, type, pixels);
- else
- rgba4444_convert_tex_image(target, level, format, width, height, border, format, type, pixels);
- } else
- assert(0);
-}
-
#endif
View
8 src/refresh/header/qgl_linked.h
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if defined(PI)
extern void myglClear(GLbitfield mask);
-extern void myglTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
#endif
extern void ( APIENTRY *qglSelectTextureSGIS )( GLenum );
@@ -78,15 +77,8 @@ extern void QGL_Shutdown ( void );
#define qglCallLists glCallLists
#if defined(PI)
#define qglClear myglClear
-#define qglClearDepth glClearDepthf
-#define qglClipPlane glClipPlanef
-#define qglDepthRange glDepthRangef
-#define qglTexImage2D glTexImage2D
#else
#define qglClear glClear
-#define qglClearDepth glClearDepth
-#define qglClipPlane glClipPlane
-#define qglDepthRange glDepthRange
#endif
#define qglClearAccum glClearAccum
#define qglClearColor glClearColor

0 comments on commit 8c7dcf1

Please sign in to comment.