ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am ba43e0a1: Merge "SurfaceFlinger: remove all GLES scissor calls." into jb-dev

Browse Source 
* commit 'ba43e0a1faee9629ca2d0beb53dd6c44bb9bfd05':
  SurfaceFlinger: remove all GLES scissor calls.
This commit is contained in:
Jamie Gennis 2012-06-06 15:47:29 -07:00 committed by Android Git Automerger
commit ec07c8e957
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -960,7 +960,6 @@ void SurfaceFlinger::debugFlashRegions()
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_SCISSOR_TEST);
static int toggle = 0; static int toggle = 0;
toggle = 1 - toggle; toggle = 1 - toggle;
@ -1819,7 +1818,6 @@ status_t SurfaceFlinger::renderScreenToTextureLocked(DisplayID dpy,
// redraw the screen entirely... // redraw the screen entirely...
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_SCISSOR_TEST);
glClearColor(0,0,0,1); glClearColor(0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
@ -1835,7 +1833,6 @@ status_t SurfaceFlinger::renderScreenToTextureLocked(DisplayID dpy,
// back to main framebuffer // back to main framebuffer
glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0); glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
glDisable(GL_SCISSOR_TEST);
glDeleteFramebuffersOES(1, &name); glDeleteFramebuffersOES(1, &name);
*textureName = tname; *textureName = tname;
@ -2048,7 +2045,6 @@ status_t SurfaceFlinger::electronBeamOffAnimationImplLocked()
glDeleteTextures(1, &tname); glDeleteTextures(1, &tname);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_SCISSOR_TEST);
return NO_ERROR; return NO_ERROR;
} }
@ -2200,7 +2196,6 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked()
glDeleteTextures(1, &tname); glDeleteTextures(1, &tname);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_SCISSOR_TEST);
return NO_ERROR; return NO_ERROR;
} }
@ -2228,7 +2223,6 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked(int32_t mode)
// always clear the whole screen at the end of the animation // always clear the whole screen at the end of the animation
glClearColor(0,0,0,1); glClearColor(0,0,0,1);
glDisable(GL_SCISSOR_TEST);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
hw.flip( Region(hw.bounds()) ); hw.flip( Region(hw.bounds()) );
@ -2366,7 +2360,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
// invert everything, b/c glReadPixel() below will invert the FB // invert everything, b/c glReadPixel() below will invert the FB
glViewport(0, 0, sw, sh); glViewport(0, 0, sw, sh);
glScissor(0, 0, sw, sh);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
@ -2390,10 +2383,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
} }
} }
// XXX: this is needed on tegra
glEnable(GL_SCISSOR_TEST);
glScissor(0, 0, sw, sh);
// check for errors and return screen capture // check for errors and return screen capture
if (glGetError() != GL_NO_ERROR) { if (glGetError() != GL_NO_ERROR) {
// error while rendering // error while rendering
@ -2419,7 +2408,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
result = NO_MEMORY; result = NO_MEMORY;
} }
} }
glDisable(GL_SCISSOR_TEST);
glViewport(0, 0, hw_w, hw_h); glViewport(0, 0, hw_w, hw_h);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPopMatrix(); glPopMatrix();