diff options
author | Chris Craik <ccraik@google.com> | 2014-05-22 00:18:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 00:18:21 +0000 |
commit | b8fe2fcd71e438b5ea6a85b1e2024ca9dc62b9d1 (patch) | |
tree | a18cc613c7830a90f2084f67ce4a15b0dd308d3b /libs/hwui/OpenGLRenderer.cpp | |
parent | 4bb692cdc4f8c7f6b5fb494c22314b7410950361 (diff) | |
parent | 797b95b26bbb7557678af78b9a2a61830158920f (diff) | |
download | frameworks_base-b8fe2fcd71e438b5ea6a85b1e2024ca9dc62b9d1.zip frameworks_base-b8fe2fcd71e438b5ea6a85b1e2024ca9dc62b9d1.tar.gz frameworks_base-b8fe2fcd71e438b5ea6a85b1e2024ca9dc62b9d1.tar.bz2 |
Merge "Define light position (using new lighting spec) in Java"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 826d988..691f1c9 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -161,9 +161,7 @@ void OpenGLRenderer::initProperties() { // Setup /////////////////////////////////////////////////////////////////////////////// -void OpenGLRenderer::setViewport(int width, int height) { - initializeViewport(width, height); - +void OpenGLRenderer::onViewportInitialized() { glDisable(GL_DITHER); glClearColor(0.0f, 0.0f, 0.0f, 0.0f); @@ -3240,7 +3238,7 @@ status_t OpenGLRenderer::drawShadow(const mat4& casterTransformXY, const mat4& c VertexBuffer spotShadowVertexBuffer; VertexBufferMode vertexBufferMode = ShadowTessellator::tessellateSpotShadow( isCasterOpaque, casterPolygon, casterVertexCount, - *currentTransform(), getWidth(), getHeight(), casterBounds, localClip, + *currentTransform(), mLightCenter, mLightRadius, casterBounds, localClip, spotShadowVertexBuffer); drawVertexBuffer(vertexBufferMode, spotShadowVertexBuffer, &paint); } |