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

am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb 

* commit '50b029d578fa06cd0733dcc7c69cb94f5f824908':
  [3418265] apply layer transformations to the DimLayer.
This commit is contained in:
Mathias Agopian 2011-02-02 16:46:46 -08:00 committed by Android Git Automerger
parent 5fced2b267 75efa55144
commit 48840800f4
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
services/surfaceflinger/LayerDim.cpp
View File

@ -30,29 +30,12 @@
namespace android {
// ---------------------------------------------------------------------------
bool LayerDim::sUseTexture;
GLuint LayerDim::sTexId;
EGLImageKHR LayerDim::sImage;
int32_t LayerDim::sWidth;
int32_t LayerDim::sHeight;
// ---------------------------------------------------------------------------
LayerDim::LayerDim(SurfaceFlinger* flinger, DisplayID display,
const sp<Client>& client)
: LayerBaseClient(flinger, display, client)
{
}
void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h)
{
sTexId = -1;
sImage = EGL_NO_IMAGE_KHR;
sWidth = w;
sHeight = h;
sUseTexture = false;
}
LayerDim::~LayerDim()
{
}
@ -84,15 +67,7 @@ void LayerDim::onDraw(const Region& clip) const
#endif
glDisable(GL_TEXTURE_2D);
GLshort w = sWidth;
GLshort h = sHeight;
const GLshort vertices[4][2] = {
{ 0, 0 },
{ 0, h },
{ w, h },
{ w, 0 }
};
glVertexPointer(2, GL_SHORT, 0, vertices);
glVertexPointer(2, GL_FLOAT, 0, mVertices);
while (it != end) {
const Rect& r = *it++;

7
services/surfaceflinger/LayerDim.h
View File

@ -31,11 +31,6 @@ namespace android {
class LayerDim : public LayerBaseClient
{
static bool sUseTexture;
static GLuint sTexId;
static EGLImageKHR sImage;
static int32_t sWidth;
static int32_t sHeight;
public:
LayerDim(SurfaceFlinger* flinger, DisplayID display,
const sp<Client>& client);
@ -47,8 +42,6 @@ public:
virtual bool isProtectedByApp() const { return false; }
virtual bool isProtectedByDRM() const { return false; }
virtual const char* getTypeId() const { return "LayerDim"; }
static void initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h);
};
// ---------------------------------------------------------------------------

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -259,8 +259,6 @@ status_t SurfaceFlinger::readyToRun()
glLoadIdentity();
glOrthof(0, w, h, 0, 0, 1);
LayerDim::initDimmer(this, w, h);
mReadyToRunBarrier.open();
/*