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

am ad070202: am e0126df2: am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"

Browse Source 
* commit 'ad07020224a19d30d8c35c248a87a1b34266bebc':
  emulator opengl: Added glFinishRoundTrip to GLESv2
This commit is contained in:
David Turner
2011-06-21 05:34:18 -07:00
committed by Android Git Automerger
parent 0ed0e2fabd ad07020224
commit f70e6700c5
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.cpp
View File

@@ -26,6 +26,7 @@ GL2Encoder::GL2Encoder(IOStream *stream) : gl2_encoder_context_t(stream)
m_glGetVertexAttribfv_enc = set_glGetVertexAttribfv(s_glGetVertexAttribfv);
m_glGetVertexAttribPointerv = set_glGetVertexAttribPointerv(s_glGetVertexAttribPointerv);
set_glShaderSource(s_glShaderSource);
set_glFinish(s_glFinish);
}
GL2Encoder::~GL2Encoder()
@@ -335,3 +336,10 @@ void GL2Encoder::s_glShaderSource(void *self, GLuint shader, GLsizei count, cons
ctx->glShaderString(ctx, shader, str, len + 1);
delete str;
}
void GL2Encoder::s_glFinish(void *self)
{
GL2Encoder *ctx = (GL2Encoder *)self;
ctx->glFinishRoundTrip(self);
}

2
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.h
View File

@@ -92,5 +92,7 @@ private:
static void s_glGetVertexAttribPointerv(void *self, GLuint index, GLenum pname, GLvoid **pointer);
static void s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLstr *string, const GLint *length);
static void s_glFinish(void *self);
};
#endif

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

@@ -547,3 +547,8 @@ glGetCompressedTextureFormats
glShaderString
len string len
flag custom_decoder
glFinishRoundTrip
flag custom_decoder
flag not_api

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

@@ -211,5 +211,4 @@ GL_ENTRY(void, glDrawElementsOffset, GLenum mode, GLsizei count, GLenum type, GL
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)
GL_ENTRY(int, glFinishRoundTrip, void)