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

am cbf73e7b: am 5d4b1f50: am c4b10a54: Merge "emulator opengl: Added glFinishRoundTrip implementation."

Browse Source 
* commit 'cbf73e7bfadd3c94fceb5afc6e51fc800acbf681':
  emulator opengl: Added glFinishRoundTrip implementation.
This commit is contained in:
David Turner
2011-06-20 09:11:19 -07:00
committed by Android Git Automerger
parent 58c9dc194d cbf73e7bfa
commit c98d28c7c6
6 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp
View File

@@ -74,10 +74,18 @@ int GLDecoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData)
set_glDrawElementsOffset(s_glDrawElementsOffset);
set_glDrawElementsData(s_glDrawElementsData);
set_glFinishRoundTrip(s_glFinishRoundTrip);
return 0;
}
int GLDecoder::s_glFinishRoundTrip(void *self)
{
GLDecoder *ctx = (GLDecoder *)self;
ctx->glFinish();
return 0;
}
void GLDecoder::s_glVertexPointerOffset(void *self, GLint size, GLenum type, GLsizei stride, GLuint offset)
{
GLDecoder *ctx = (GLDecoder *)self;

2
tools/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h
View File

@@ -59,6 +59,8 @@ private:
static void s_glMatrixIndexPointerData(void * self, GLint size, GLenum type, GLsizei stride, void * data, GLuint datalen);
static void s_glMatrixIndexPointerOffset(void * self, GLint size, GLenum type, GLsizei stride, GLuint offset);
static int s_glFinishRoundTrip(void *self);
static void * s_getProc(const char *name, void *userData);
GLDecoderContextData *m_contextData;

7
tools/emulator/opengl/system/GLESv1_enc/GLEncoder.cpp
View File

@@ -467,6 +467,7 @@ GLEncoder::GLEncoder(IOStream *stream) : gl_encoder_context_t(stream)
m_glDrawArrays_enc = set_glDrawArrays(s_glDrawArrays);
m_glDrawElements_enc = set_glDrawElements(s_glDrawElements);
set_glGetString(s_glGetString);
set_glFinish(s_glFinish);
}
@@ -480,3 +481,9 @@ size_t GLEncoder::pixelDataSize(GLsizei width, GLsizei height, GLenum format, GL
assert(m_state != NULL);
return m_state->pixelDataSize(width, height, format, type, pack);
}
void GLEncoder::s_glFinish(void *self)
{
GLEncoder *ctx = (GLEncoder *)self;
ctx->glFinishRoundTrip(self);
}

2
tools/emulator/opengl/system/GLESv1_enc/GLEncoder.h
View File

@@ -87,6 +87,8 @@ private:
static void s_glDrawArrays(void *self, GLenum mode, GLint first, GLsizei count);
static void s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum type, const void *indices);
static void s_glPixelStorei(void *self, GLenum param, GLint value);
static void s_glFinish(void *self);
void sendVertexData(unsigned first, unsigned count);
};
#endif

3
tools/emulator/opengl/system/GLESv1_enc/gl.attrib
View File

@@ -349,6 +349,9 @@ glGetCompressedTextureFormats
flag custom_decoder
flag not_api
glFinishRoundTrip
flag custom_decoder
flag not_api
#gles1 extensions

2
tools/emulator/opengl/system/GLESv1_enc/gl.in
View File

@@ -163,7 +163,7 @@ 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(int, glFinishRoundTrip, void)
#opengl extensions