diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:26:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:26:26 +0000 |
| commit | 02a1a37c8d223502d311e53de56d4f1461db8dea (patch) | |
| tree | 60e44f099f24300271f2169f4e2e4d1924963ff8 | |
| parent | 804738f19a1c0dbe56346fa121fb1441a6cfdbb0 (diff) | |
| download | include-02a1a37c8d223502d311e53de56d4f1461db8dea.tar.gz | |
Use fixed function pipeline only when drawing paths
Use fixed function pipeline only when drawing paths. Previously FF
vertex shader was used when drawing normal geometry if path rendering
was enabled.
This is required to make Chromium integration easier. This way
fixed function vertex shading, including vertexshader-less programs,
need not be implemented in the Chromium command buffer.
Removes FF TexGen functionality, as it is not used anymore. Likewise
removes the fixedFunctionSupport GL capability flag.
BUG=chromium:344330
R=bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/212753002
git-svn-id: http://skia.googlecode.com/svn/trunk/include@14334 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/gl/GrGLFunctions.h | 3 | ||||
| -rw-r--r-- | gpu/gl/GrGLInterface.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/gpu/gl/GrGLFunctions.h b/gpu/gl/GrGLFunctions.h index a6bfd4a..5dc3dee 100644 --- a/gpu/gl/GrGLFunctions.h +++ b/gpu/gl/GrGLFunctions.h @@ -175,9 +175,6 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskSeparateProc)(GrGLenum face, GrGLuint mask); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpProc)(GrGLenum fail, GrGLenum zfail, GrGLenum zpass); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpSeparateProc)(GrGLenum face, GrGLenum fail, GrGLenum zfail, GrGLenum zpass); - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexGenfProc)(GrGLenum coord, GrGLenum pname, GrGLfloat param); - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexGenfvProc)(GrGLenum coord, GrGLenum pname, const GrGLfloat* params); - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexGeniProc)(GrGLenum coord, GrGLenum pname, GrGLint param); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexImage2DProc)(GrGLenum target, GrGLint level, GrGLint internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid* pixels); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameteriProc)(GrGLenum target, GrGLenum pname, GrGLint param); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameterivProc)(GrGLenum target, GrGLenum pname, const GrGLint* params); diff --git a/gpu/gl/GrGLInterface.h b/gpu/gl/GrGLInterface.h index f206c6b..fd22792 100644 --- a/gpu/gl/GrGLInterface.h +++ b/gpu/gl/GrGLInterface.h @@ -279,8 +279,6 @@ public: GLPtr<GrGLStencilMaskSeparateProc> fStencilMaskSeparate; GLPtr<GrGLStencilOpProc> fStencilOp; GLPtr<GrGLStencilOpSeparateProc> fStencilOpSeparate; - GLPtr<GrGLTexGenfvProc> fTexGenfv; - GLPtr<GrGLTexGeniProc> fTexGeni; GLPtr<GrGLTexImage2DProc> fTexImage2D; GLPtr<GrGLTexParameteriProc> fTexParameteri; GLPtr<GrGLTexParameterivProc> fTexParameteriv; |