OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Move GL_RGB565 workaround into fbobject.c

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-04-22 21:11:56 -04:00
parent 44f9aef9ee
commit 61d94dd207
5 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mesa/es/main/es_fbo.c
View File

@@ -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);
}

2
src/mesa/es/sources.mak
View File

@@ -7,7 +7,6 @@ LOCAL_ES1_SOURCES := \
main/drawtex.c \ main/drawtex.c \
main/es_cpaltex.c \ main/es_cpaltex.c \
main/es_enable.c \ main/es_enable.c \
main/es_fbo.c \
main/es_query_matrix.c \ main/es_query_matrix.c \
main/es_texgen.c \ main/es_texgen.c \
glapi/glapi-es1/main/enums.c glapi/glapi-es1/main/enums.c
@@ -28,7 +27,6 @@ LOCAL_ES1_INCLUDES := \
LOCAL_ES2_SOURCES := \ LOCAL_ES2_SOURCES := \
main/get_es2.c \ main/get_es2.c \
main/es_cpaltex.c \ main/es_cpaltex.c \
main/es_fbo.c \
glapi/glapi-es2/main/enums.c glapi/glapi-es2/main/enums.c
LOCAL_ES2_GALLIUM_SOURCES := \ LOCAL_ES2_GALLIUM_SOURCES := \

15
src/mesa/main/fbobject.c
View File

@@ -1110,7 +1110,22 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
renderbuffer_storage(target, internalFormat, width, height, 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 void GLAPIENTRY
_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)

4
src/mesa/main/fbobject.h
View File

@@ -88,6 +88,10 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
GLenum internalformat, GLenum internalformat,
GLsizei width, GLsizei height); GLsizei width, GLsizei height);
extern void GLAPIENTRY
_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
GLsizei width, GLsizei height);
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image); _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);

4
src/mesa/main/glheader.h
View File

@@ -85,6 +85,10 @@ typedef void *GLeglImageOES;
#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 #define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
#endif #endif
/* GLES 2.0 token */
#ifndef GL_RGB565
#define GL_RGB565 0x8D62
#endif
/** /**
* Special, internal token * Special, internal token