summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/es/main/es_fbo.c37
-rw-r--r--src/mesa/es/sources.mak2
-rw-r--r--src/mesa/main/fbobject.c15
-rw-r--r--src/mesa/main/fbobject.h4
-rw-r--r--src/mesa/main/glheader.h4
5 files changed, 23 insertions, 39 deletions
diff --git a/src/mesa/es/main/es_fbo.c b/src/mesa/es/main/es_fbo.c
deleted file mode 100644
index 1803637830..0000000000
--- 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 e6908feea3..3beea38884 100644
--- 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 8d44246618..201a023246 100644
--- 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 28f75dfca7..40a18f8341 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -89,6 +89,10 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
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);
extern void GLAPIENTRY
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 77544c88c6..7f01d9f39b 100644
--- 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