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

Unified Diff: src/gpu/gl/GrGLGpu.h

Issue 2123693002: Revert of Begin instanced rendering for simple shapes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 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/GrGpu.h ('k') | src/gpu/gl/GrGLGpu.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLGpu.h
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index b7daa431d846360ce067de22a977d21931c5558b..013613ad272c59b49ff4a361c5c1d5c7a2bcd96a 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -28,8 +28,6 @@
class GrNonInstancedMesh;
class GrSwizzle;
-namespace gr_instanced { class GLInstancedRendering; }
-
#ifdef SK_DEBUG
#define PROGRAM_CACHE_STATS
#endif
@@ -55,8 +53,6 @@
SkASSERT(glCaps().shaderCaps()->pathRenderingSupport());
return static_cast<GrGLPathRendering*>(pathRendering());
}
-
- gr_instanced::InstancedRendering* createInstancedRenderingIfSupported() override;
// Used by GrGLProgram to configure OpenGL state.
void bindTexture(int unitIdx, const GrTextureParams& params, bool allowSRGBInputs,
@@ -601,7 +597,6 @@
typedef GrGpu INHERITED;
friend class GrGLPathRendering; // For accessing setTextureUnit.
- friend class gr_instanced::GLInstancedRendering; // For accessing flushGLState.
};
#endif
« no previous file with comments | « src/gpu/GrGpu.h ('k') | src/gpu/gl/GrGLGpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698