mesa: Move GL_RGB565 workaround into fbobject.c

diff --git a/src/mesa/es/main/es_fbo.c b/src/mesa/es/main/es_fbo.c
deleted file mode 100644 (file)
index 1803637..0000000
--- a/src/mesa/es/main/es_fbo.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- **************************************************************************/
-
-
-#include "GLES2/gl2.h"
-#include "GLES2/gl2ext.h"
-
-
-#ifndef GL_RGB5
-#define GL_RGB5                                        0x8050
-#endif
-
-
-extern void GL_APIENTRY _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height);
-
-extern void GL_APIENTRY _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height);
-
-
-void GL_APIENTRY
-_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-                           GLsizei width, GLsizei height)
-{
-   switch (internalFormat) {
-   case GL_RGB565:
-      /* XXX this confuses GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-      /* choose a closest format */
-      internalFormat = GL_RGB5;
-      break;
-   default:
-      break;
-   }
-   _mesa_RenderbufferStorageEXT(target, internalFormat, width, height);
-}

diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index e6908feea312fed599de65a98102287a278b2f93..3beea3888446f727d838ef885089bf4393929b92 100644 (file)
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -7,7 +7,6 @@ LOCAL_ES1_SOURCES :=                    \
        main/drawtex.c                  \
        main/es_cpaltex.c               \
        main/es_enable.c                \
-       main/es_fbo.c                   \
        main/es_query_matrix.c          \
        main/es_texgen.c                \
        glapi/glapi-es1/main/enums.c
@@ -28,7 +27,6 @@ LOCAL_ES1_INCLUDES :=                 \
 LOCAL_ES2_SOURCES :=                   \
        main/get_es2.c                  \
        main/es_cpaltex.c               \
-       main/es_fbo.c                   \
        glapi/glapi-es2/main/enums.c
 
 LOCAL_ES2_GALLIUM_SOURCES :=           \

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 8d44246618702de05c6eca96c694ffb224bf6806..201a023246411110b2c6967935cbc1a9232870c2 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1110,7 +1110,22 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
    renderbuffer_storage(target, internalFormat, width, height, samples);
 }
 
+void GLAPIENTRY
+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+                          GLsizei width, GLsizei height)
+{
+   switch (internalFormat) {
+   case GL_RGB565:
+      /* XXX this confuses GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+      /* choose a closest format */
+      internalFormat = GL_RGB5;
+      break;
+   default:
+      break;
+   }
 
+   renderbuffer_storage(target, internalFormat, width, height, 0);
+}
 
 void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)

diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 28f75dfca795e7a0f2309a4328bce77b4b5cb1cc..40a18f834121b0cabc1a25180258019d52fbf89f 100644 (file)
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -88,6 +88,10 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
                                      GLenum internalformat,
                                      GLsizei width, GLsizei height);
 
+extern void GLAPIENTRY
+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+                          GLsizei width, GLsizei height);
+
 extern void GLAPIENTRY
 _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
 

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 77544c88c669ca5f24dca9f164dd11f58c01afa5..7f01d9f39bd14554448470f7d162c63b46effd85 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -85,6 +85,10 @@ typedef void *GLeglImageOES;
 #define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
 #endif
 
+/* GLES 2.0 token */
+#ifndef GL_RGB565
+#define GL_RGB565 0x8D62
+#endif
 
 /**
  * Special, internal token