diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-25 06:21:30 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-25 06:21:30 +0000 |
| commit | 04677cffe4d08dc51d1503116f2a0c8d7feac4bd (patch) | |
| tree | 0970a2da1b073c71d5e77562d289be671948d0e2 | |
| parent | f2ef56426751678eb64f82f71404f93ee3a58351 (diff) | |
| download | include-04677cffe4d08dc51d1503116f2a0c8d7feac4bd.tar.gz | |
Use EXT_direct_state_access for path matrix manipulation
Use EXT_direct_state_access for path matrix manipulation when using
NV_path_rendering extension. This makes Chromium command buffer
integration easier, since the current matrix mode does not need to be
exposed as state and fewer function calls and enums are needed.
BUG=chromium:344330
R=bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/245963009
git-svn-id: http://skia.googlecode.com/svn/trunk/include@14374 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/gl/GrGLFunctions.h | 5 | ||||
| -rw-r--r-- | gpu/gl/GrGLInterface.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gpu/gl/GrGLFunctions.h b/gpu/gl/GrGLFunctions.h index 5dc3dee..3f87365 100644 --- a/gpu/gl/GrGLFunctions.h +++ b/gpu/gl/GrGLFunctions.h @@ -211,9 +211,8 @@ extern "C" { // Experimental: Functions for GL_NV_path_rendering. These will be // alphabetized with the above functions once this is fully supported // (and functions we are unlikely to use will possibly be omitted). - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixModeProc)(GrGLenum); - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLoadIdentityProc)(); - typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLoadMatrixfProc)(const GrGLfloat* m); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadfProc)(GrGLenum matrixMode, const GrGLfloat* m); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadIdentityProc)(GrGLenum); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathCommandsProc)(GrGLuint path, GrGLsizei numCommands, const GrGLubyte *commands, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathCoordsProc)(GrGLuint path, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathSubCommandsProc)(GrGLuint path, GrGLsizei commandStart, GrGLsizei commandsToDelete, GrGLsizei numCommands, const GrGLubyte *commands, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords); diff --git a/gpu/gl/GrGLInterface.h b/gpu/gl/GrGLInterface.h index fd22792..9070af2 100644 --- a/gpu/gl/GrGLInterface.h +++ b/gpu/gl/GrGLInterface.h @@ -230,12 +230,11 @@ public: GLPtr<GrGLInvalidateTexSubImageProc> fInvalidateTexSubImage; GLPtr<GrGLLineWidthProc> fLineWidth; GLPtr<GrGLLinkProgramProc> fLinkProgram; - GLPtr<GrGLLoadIdentityProc> fLoadIdentity; - GLPtr<GrGLLoadMatrixfProc> fLoadMatrixf; GLPtr<GrGLMapBufferProc> fMapBuffer; GLPtr<GrGLMapBufferSubDataProc> fMapBufferSubData; GLPtr<GrGLMapTexSubImage2DProc> fMapTexSubImage2D; - GLPtr<GrGLMatrixModeProc> fMatrixMode; + GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf; + GLPtr<GrGLMatrixLoadIdentityProc> fMatrixLoadIdentity; GLPtr<GrGLPixelStoreiProc> fPixelStorei; GLPtr<GrGLPopGroupMarkerProc> fPopGroupMarker; GLPtr<GrGLPushGroupMarkerProc> fPushGroupMarker; |