LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 81973086: am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"

Browse Source 
* commit '81973086cf93e84fdbac204a4d9dd06cbe72798c':
  opengles emulator: GLES2 codec - glFinishRoundTrip
This commit is contained in:
David Turner
2011-08-09 10:06:58 -07:00
committed by Android Git Automerger
parent eac7fbd6b3 81973086cf
commit b5e8d4c520
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp
View File

@@ -58,10 +58,18 @@ int GL2Decoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData)
set_glDrawElementsOffset(s_glDrawElementsOffset); set_glDrawElementsOffset(s_glDrawElementsOffset);
set_glDrawElementsData(s_glDrawElementsData); set_glDrawElementsData(s_glDrawElementsData);
set_glShaderString(s_glShaderString); set_glShaderString(s_glShaderString);
set_glFinishRoundTrip(s_glFinishRoundTrip);
return 0; return 0;
} }
int GL2Decoder::s_glFinishRoundTrip(void *self)
{
GL2Decoder *ctx = (GL2Decoder *)self;
ctx->glFinish();
return 0;
}
void GL2Decoder::s_glGetCompressedTextureFormats(void *self, int count, GLint *formats) void GL2Decoder::s_glGetCompressedTextureFormats(void *self, int count, GLint *formats)
{ {
GL2Decoder *ctx = (GL2Decoder *) self; GL2Decoder *ctx = (GL2Decoder *) self;

1
tools/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.h
View File

@@ -31,5 +31,6 @@ private:
static void gl2_APIENTRY s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count, GLenum type, GLuint offset); static void gl2_APIENTRY s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count, GLenum type, GLuint offset);
static void gl2_APIENTRY s_glDrawElementsData(void *self, GLenum mode, GLsizei count, GLenum type, void * data, GLuint datalen); static void gl2_APIENTRY s_glDrawElementsData(void *self, GLenum mode, GLsizei count, GLenum type, void * data, GLuint datalen);
static void gl2_APIENTRY s_glShaderString(void *self, GLuint shader, const GLchar* string, GLsizei len); static void gl2_APIENTRY s_glShaderString(void *self, GLuint shader, const GLchar* string, GLsizei len);
static int gl2_APIENTRY s_glFinishRoundTrip(void *self);
}; };
#endif #endif