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

am d4427e57: am d10c9651: Merge "opengl emulator - handle shader string decoding"

Browse Source 
* commit 'd4427e5758766b2f3f721b90a6d74a6167872959':
  opengl emulator - handle shader string decoding
This commit is contained in:
David Turner
2011-05-03 13:43:50 -07:00
committed by Android Git Automerger
parent 290e934051 d4427e5758
commit 5dec7c0cc7
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ int GL2Decoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData)
set_glDrawElementsOffset(s_glDrawElementsOffset);
set_glDrawElementsData(s_glDrawElementsData);
set_glShaderString(s_glShaderString);
return 0;
}
@@ -108,3 +108,8 @@ void GL2Decoder::s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count,
ctx->glDrawElements(mode, count, type, (void *)offset);
}
void GL2Decoder::s_glShaderString(void *self, GLuint shader, GLstr string, GLsizei len)
{
GL2Decoder *ctx = (GL2Decoder *)self;
ctx->glShaderSource(shader, 1, &string, NULL);
}

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

@@ -30,8 +30,6 @@ private:
static void s_glDrawElementsOffset(void *self, GLenum mode, GLsizei count, GLenum type, GLuint offset);
static void s_glDrawElementsData(void *self, GLenum mode, GLsizei count, GLenum type, void * data, GLuint datalen);
static void s_glShaderString(void *self, GLuint shader, GLstr string, GLsizei len);
};
#endif

5
tools/emulator/opengl/system/GLESv2_enc/gl2.attrib
View File

@@ -538,3 +538,8 @@ glGetCompressedTextureFormats
dir formats out
len formats (count * sizeof(GLint))
flag custom_decoder
#GL_ENTRY(void, glShaderString, GLuint shader, GLchar *string, GLsizei len)
glShaderString
len string len
flag custom_decoder

1
tools/emulator/opengl/system/GLESv2_enc/gl2.in
View File

@@ -211,5 +211,6 @@ GL_ENTRY(void, glVertexAttribPointerOffset, GLuint indx, GLint size, GLenum type
GL_ENTRY(void, glDrawElementsOffset, GLenum mode, GLsizei count, GLenum type, GLuint offset)
GL_ENTRY(void, glDrawElementsData, GLenum mode, GLsizei count, GLenum type, void *data, GLuint datalen)
GL_ENTRY(void, glGetCompressedTextureFormats, int count, GLint *formats)
GL_ENTRY(void, glShaderString, GLuint shader, GLstr string, GLsizei len)