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

am b0361b1c: am 022254b8: am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."

Browse Source 
* commit 'b0361b1c11f7b80364e5e7ed70086cf710ea737e':
  opengl renderer: Fixed colorBuffer texture creation.
This commit is contained in:
David Turner
2011-06-21 11:44:12 -07:00
committed by Android Git Automerger
parent 4391d215e1 b0361b1c11
commit cdb5dd3550
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/emulator/opengl/host/libs/libOpenglRender/ColorBuffer.cpp
View File

@@ -28,17 +28,38 @@ ColorBuffer *ColorBuffer::create(int p_width, int p_height,
{ {
FrameBuffer *fb = FrameBuffer::getFB(); FrameBuffer *fb = FrameBuffer::getFB();
GLenum texInternalFormat = 0;
switch(p_internalFormat) {
case GL_RGB:
case GL_RGB565_OES:
texInternalFormat = GL_RGB;
break;
case GL_RGBA:
case GL_RGB5_A1_OES:
case GL_RGBA4_OES:
texInternalFormat = GL_RGBA;
break;
default:
return NULL;
break;
}
if (!fb->bind_locked()) { if (!fb->bind_locked()) {
return NULL; return NULL;
} }
ColorBuffer *cb = new ColorBuffer(); ColorBuffer *cb = new ColorBuffer();
s_gl.glGenTextures(1, &cb->m_tex); s_gl.glGenTextures(1, &cb->m_tex);
s_gl.glBindTexture(GL_TEXTURE_2D, cb->m_tex); s_gl.glBindTexture(GL_TEXTURE_2D, cb->m_tex);
s_gl.glTexImage2D(GL_TEXTURE_2D, 0, p_internalFormat, s_gl.glTexImage2D(GL_TEXTURE_2D, 0, texInternalFormat,
p_width, p_height, 0, p_width, p_height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, NULL); texInternalFormat,
GL_UNSIGNED_BYTE, NULL);
s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); s_gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);