diff options
Diffstat (limited to 'libs/surfaceflinger/LayerDim.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerDim.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/surfaceflinger/LayerDim.cpp b/libs/surfaceflinger/LayerDim.cpp index 54c5d9f..0825916 100644 --- a/libs/surfaceflinger/LayerDim.cpp +++ b/libs/surfaceflinger/LayerDim.cpp @@ -55,6 +55,10 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) sHeight = h; sUseTexture = false; +#if defined(DIM_WITH_TEXTURE) && defined(EGL_ANDROID_image_native_buffer) + +#warning "using a texture to implement LayerDim" + /* On some h/w like msm7K, it is faster to use a texture because the * software renderer will defer to copybit, for this to work we need to * use an EGLImage texture so copybit can actually make use of it. @@ -64,8 +68,7 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) const DisplayHardware& hw(flinger->graphicPlane(0).displayHardware()); uint32_t flags = hw.getFlags(); - if (LIKELY((flags & DisplayHardware::DIRECT_TEXTURE) && - (flags & DisplayHardware::SLOW_CONFIG))) { + if (LIKELY(flags & DisplayHardware::DIRECT_TEXTURE)) { sp<GraphicBuffer> buffer = new GraphicBuffer(w, h, PIXEL_FORMAT_RGB_565, GraphicBuffer::USAGE_SW_WRITE_OFTEN | GraphicBuffer::USAGE_HW_TEXTURE); @@ -98,6 +101,7 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) buffer->unlock(); sUseTexture = true; } +#endif } LayerDim::~LayerDim() @@ -113,13 +117,13 @@ void LayerDim::onDraw(const Region& clip) const const DisplayHardware& hw(graphicPlane(0).displayHardware()); const GGLfixed alpha = (s.alpha << 16)/255; const uint32_t fbHeight = hw.getHeight(); - const uint32_t flags = hw.getFlags(); glDisable(GL_DITHER); glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glColor4x(0, 0, 0, alpha); - if (sUseTexture && (flags & DisplayHardware::SLOW_CONFIG)) { +#if defined(DIM_WITH_TEXTURE) && defined(EGL_ANDROID_image_native_buffer) + if (sUseTexture) { glBindTexture(GL_TEXTURE_2D, sTexId); glEnable(GL_TEXTURE_2D); glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); @@ -134,6 +138,7 @@ void LayerDim::onDraw(const Region& clip) const glEnableClientState(GL_TEXTURE_COORD_ARRAY); glTexCoordPointer(2, GL_SHORT, 0, texCoords); } else +#endif { glDisable(GL_TEXTURE_2D); } |