Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(888)

Unified Diff: src/gpu/gl/GrGpuGL_program.cpp

Issue 23513006: Add glTexGen funcs to interface (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: mesa Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGpuGL.cpp ('k') | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGpuGL_program.cpp
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
index 7ead7b74b0f036d9858aeafbd78bb9d7c3c05952..7b7b5155da4dd76fab07d069b337e522f8ecc8a8 100644
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -209,9 +209,9 @@ void GrGpuGL::flushPathStencilMatrix() {
size.set(rt->width(), rt->height());
const SkMatrix& vm = this->getDrawState().getViewMatrix();
- if (fHWPathStencilMatrixState.fRenderTargetOrigin != rt->origin() ||
- !fHWPathStencilMatrixState.fViewMatrix.cheapEqualTo(viewMatrix) ||
- fHWPathStencilMatrixState.fRenderTargetSize!= size) {
+ if (fHWProjectionMatrixState.fRenderTargetOrigin != rt->origin() ||
+ !fHWProjectionMatrixState.fViewMatrix.cheapEqualTo(viewMatrix) ||
+ fHWProjectionMatrixState.fRenderTargetSize!= size) {
// rescale the coords from skia's "device" coords to GL's normalized coords,
// and perform a y-flip if required.
SkMatrix m;
@@ -249,9 +249,9 @@ void GrGpuGL::flushPathStencilMatrix() {
};
GL_CALL(MatrixMode(GR_GL_PROJECTION));
GL_CALL(LoadMatrixf(mv));
- fHWPathStencilMatrixState.fViewMatrix = vm;
- fHWPathStencilMatrixState.fRenderTargetSize = size;
- fHWPathStencilMatrixState.fRenderTargetOrigin = rt->origin();
+ fHWProjectionMatrixState.fViewMatrix = vm;
+ fHWProjectionMatrixState.fRenderTargetSize = size;
+ fHWProjectionMatrixState.fRenderTargetOrigin = rt->origin();
}
}
« no previous file with comments | « src/gpu/gl/GrGpuGL.cpp ('k') | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698