Skip to content

A
angle
Commit a8cb287c by Geoff Lang Committed by Commit Bot
Options

Rename syncRendererState methods to syncImplementationState.

BUG=angleproject:2107 Change-Id: I45b914a6edf721c6ec53ca2bc6e139685b059d20 Reviewed-on: https://chromium-review.googlesource.com/957271 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent baf208a0
Showing with 38 additions and 39 deletions
src/libANGLE/Context.cpp
...@@ -1944,7 +1944,7 @@ void Context::stencilFillPath(GLuint path, GLenum fillMode, GLuint mask) ...@@ -1944,7 +1944,7 @@ void Context::stencilFillPath(GLuint path, GLenum fillMode, GLuint mask)
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilFillPath(pathObj, fillMode, mask); mImplementation->stencilFillPath(pathObj, fillMode, mask);
} }
...@@ -1956,7 +1956,7 @@ void Context::stencilStrokePath(GLuint path, GLint reference, GLuint mask) ...@@ -1956,7 +1956,7 @@ void Context::stencilStrokePath(GLuint path, GLint reference, GLuint mask)
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilStrokePath(pathObj, reference, mask); mImplementation->stencilStrokePath(pathObj, reference, mask);
} }
...@@ -1968,7 +1968,7 @@ void Context::coverFillPath(GLuint path, GLenum coverMode) ...@@ -1968,7 +1968,7 @@ void Context::coverFillPath(GLuint path, GLenum coverMode)
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->coverFillPath(pathObj, coverMode); mImplementation->coverFillPath(pathObj, coverMode);
} }
...@@ -1980,7 +1980,7 @@ void Context::coverStrokePath(GLuint path, GLenum coverMode) ...@@ -1980,7 +1980,7 @@ void Context::coverStrokePath(GLuint path, GLenum coverMode)
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->coverStrokePath(pathObj, coverMode); mImplementation->coverStrokePath(pathObj, coverMode);
} }
...@@ -1992,7 +1992,7 @@ void Context::stencilThenCoverFillPath(GLuint path, GLenum fillMode, GLuint mask ...@@ -1992,7 +1992,7 @@ void Context::stencilThenCoverFillPath(GLuint path, GLenum fillMode, GLuint mask
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilThenCoverFillPath(pathObj, fillMode, mask, coverMode); mImplementation->stencilThenCoverFillPath(pathObj, fillMode, mask, coverMode);
} }
...@@ -2007,7 +2007,7 @@ void Context::stencilThenCoverStrokePath(GLuint path, ...@@ -2007,7 +2007,7 @@ void Context::stencilThenCoverStrokePath(GLuint path,
return; return;
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilThenCoverStrokePath(pathObj, reference, mask, coverMode); mImplementation->stencilThenCoverStrokePath(pathObj, reference, mask, coverMode);
} }
...@@ -2023,7 +2023,7 @@ void Context::coverFillPathInstanced(GLsizei numPaths, ...@@ -2023,7 +2023,7 @@ void Context::coverFillPathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->coverFillPathInstanced(pathObjects, coverMode, transformType, transformValues); mImplementation->coverFillPathInstanced(pathObjects, coverMode, transformType, transformValues);
} }
...@@ -2039,7 +2039,7 @@ void Context::coverStrokePathInstanced(GLsizei numPaths, ...@@ -2039,7 +2039,7 @@ void Context::coverStrokePathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->coverStrokePathInstanced(pathObjects, coverMode, transformType, mImplementation->coverStrokePathInstanced(pathObjects, coverMode, transformType,
transformValues); transformValues);
...@@ -2057,7 +2057,7 @@ void Context::stencilFillPathInstanced(GLsizei numPaths, ...@@ -2057,7 +2057,7 @@ void Context::stencilFillPathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilFillPathInstanced(pathObjects, fillMode, mask, transformType, mImplementation->stencilFillPathInstanced(pathObjects, fillMode, mask, transformType,
transformValues); transformValues);
...@@ -2075,7 +2075,7 @@ void Context::stencilStrokePathInstanced(GLsizei numPaths, ...@@ -2075,7 +2075,7 @@ void Context::stencilStrokePathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilStrokePathInstanced(pathObjects, reference, mask, transformType, mImplementation->stencilStrokePathInstanced(pathObjects, reference, mask, transformType,
transformValues); transformValues);
...@@ -2094,7 +2094,7 @@ void Context::stencilThenCoverFillPathInstanced(GLsizei numPaths, ...@@ -2094,7 +2094,7 @@ void Context::stencilThenCoverFillPathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilThenCoverFillPathInstanced(pathObjects, coverMode, fillMode, mask, mImplementation->stencilThenCoverFillPathInstanced(pathObjects, coverMode, fillMode, mask,
transformType, transformValues); transformType, transformValues);
...@@ -2113,7 +2113,7 @@ void Context::stencilThenCoverStrokePathInstanced(GLsizei numPaths, ...@@ -2113,7 +2113,7 @@ void Context::stencilThenCoverStrokePathInstanced(GLsizei numPaths,
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase); const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering? // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
ANGLE_CONTEXT_TRY(syncRendererState()); ANGLE_CONTEXT_TRY(syncState());
mImplementation->stencilThenCoverStrokePathInstanced(pathObjects, coverMode, reference, mask, mImplementation->stencilThenCoverStrokePathInstanced(pathObjects, coverMode, reference, mask,
transformType, transformValues); transformType, transformValues);
...@@ -2913,7 +2913,7 @@ void Context::initWorkarounds() ...@@ -2913,7 +2913,7 @@ void Context::initWorkarounds()
Error Context::prepareForDraw() Error Context::prepareForDraw()
{ {
ANGLE_TRY(syncRendererDirtyObjects()); ANGLE_TRY(syncDirtyObjects());
if (isRobustResourceInitEnabled()) if (isRobustResourceInitEnabled())
{ {
...@@ -2921,43 +2921,42 @@ Error Context::prepareForDraw() ...@@ -2921,43 +2921,42 @@ Error Context::prepareForDraw()
ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureDrawAttachmentsInitialized(this)); ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureDrawAttachmentsInitialized(this));
} }
ANGLE_TRY(syncRendererDirtyBits()); ANGLE_TRY(syncDirtyBits());
return NoError(); return NoError();
} }
Error Context::prepareForClear(GLbitfield mask) Error Context::prepareForClear(GLbitfield mask)
{ {
ANGLE_TRY(syncRendererDirtyObjects(mClearDirtyObjects)); ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearAttachmentsInitialized(this, mask)); ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearAttachmentsInitialized(this, mask));
ANGLE_TRY(syncRendererDirtyBits(mClearDirtyBits)); ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
return NoError(); return NoError();
} }
Error Context::prepareForClearBuffer(GLenum buffer, GLint drawbuffer) Error Context::prepareForClearBuffer(GLenum buffer, GLint drawbuffer)
{ {
ANGLE_TRY(syncRendererDirtyObjects(mClearDirtyObjects)); ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearBufferAttachmentsInitialized(this, buffer, ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearBufferAttachmentsInitialized(this, buffer,
drawbuffer)); drawbuffer));
ANGLE_TRY(syncRendererDirtyBits(mClearDirtyBits)); ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
return NoError(); return NoError();
} }
Error Context::syncRendererState() Error Context::syncState()
{ {
ANGLE_TRY(syncRendererDirtyObjects()); ANGLE_TRY(syncDirtyObjects());
ANGLE_TRY(syncRendererDirtyBits()); ANGLE_TRY(syncDirtyBits());
return NoError(); return NoError();
} }
Error Context::syncRendererState(const State::DirtyBits &bitMask, Error Context::syncState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask)
const State::DirtyObjects &objectMask)
{ {
ANGLE_TRY(syncRendererDirtyObjects(objectMask)); ANGLE_TRY(syncDirtyObjects(objectMask));
ANGLE_TRY(syncRendererDirtyBits(bitMask)); ANGLE_TRY(syncDirtyBits(bitMask));
return NoError(); return NoError();
} }
Error Context::syncRendererDirtyBits() Error Context::syncDirtyBits()
{ {
const State::DirtyBits &dirtyBits = mGLState.getDirtyBits(); const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
mImplementation->syncState(this, dirtyBits); mImplementation->syncState(this, dirtyBits);
...@@ -2965,7 +2964,7 @@ Error Context::syncRendererDirtyBits() ...@@ -2965,7 +2964,7 @@ Error Context::syncRendererDirtyBits()
return NoError(); return NoError();
} }
Error Context::syncRendererDirtyBits(const State::DirtyBits &bitMask) Error Context::syncDirtyBits(const State::DirtyBits &bitMask)
{ {
const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask); const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
mImplementation->syncState(this, dirtyBits); mImplementation->syncState(this, dirtyBits);
...@@ -2973,12 +2972,12 @@ Error Context::syncRendererDirtyBits(const State::DirtyBits &bitMask) ...@@ -2973,12 +2972,12 @@ Error Context::syncRendererDirtyBits(const State::DirtyBits &bitMask)
return NoError(); return NoError();
} }
Error Context::syncRendererDirtyObjects() Error Context::syncDirtyObjects()
{ {
return mGLState.syncDirtyObjects(this); return mGLState.syncDirtyObjects(this);
} }
Error Context::syncRendererDirtyObjects(const State::DirtyObjects &objectMask) Error Context::syncDirtyObjects(const State::DirtyObjects &objectMask)
{ {
return mGLState.syncDirtyObjects(this, objectMask); return mGLState.syncDirtyObjects(this, objectMask);
} }
...@@ -3678,17 +3677,17 @@ void Context::flushMappedBufferRange(BufferBinding /*target*/, ...@@ -3678,17 +3677,17 @@ void Context::flushMappedBufferRange(BufferBinding /*target*/,
Error Context::syncStateForReadPixels() Error Context::syncStateForReadPixels()
{ {
return syncRendererState(mReadPixelsDirtyBits, mReadPixelsDirtyObjects); return syncState(mReadPixelsDirtyBits, mReadPixelsDirtyObjects);
} }
Error Context::syncStateForTexImage() Error Context::syncStateForTexImage()
{ {
return syncRendererState(mTexImageDirtyBits, mTexImageDirtyObjects); return syncState(mTexImageDirtyBits, mTexImageDirtyObjects);
} }
Error Context::syncStateForBlit() Error Context::syncStateForBlit()
{ {
return syncRendererState(mBlitDirtyBits, mBlitDirtyObjects); return syncState(mBlitDirtyBits, mBlitDirtyObjects);
} }
void Context::activeShaderProgram(GLuint pipeline, GLuint program) void Context::activeShaderProgram(GLuint pipeline, GLuint program)
...@@ -4355,7 +4354,7 @@ Error Context::getZeroFilledBuffer(size_t requstedSizeBytes, ...@@ -4355,7 +4354,7 @@ Error Context::getZeroFilledBuffer(size_t requstedSizeBytes,
Error Context::prepareForDispatch() Error Context::prepareForDispatch()
{ {
ANGLE_TRY(syncRendererState(mComputeDirtyBits, mComputeDirtyObjects)); ANGLE_TRY(syncState(mComputeDirtyBits, mComputeDirtyObjects));
if (isRobustResourceInitEnabled()) if (isRobustResourceInitEnabled())
{ {
......
src/libANGLE/Context.h
...@@ -1208,12 +1208,12 @@ class Context final : angle::NonCopyable ...@@ -1208,12 +1208,12 @@ class Context final : angle::NonCopyable
Error prepareForDraw(); Error prepareForDraw();
Error prepareForClear(GLbitfield mask); Error prepareForClear(GLbitfield mask);
Error prepareForClearBuffer(GLenum buffer, GLint drawbuffer); Error prepareForClearBuffer(GLenum buffer, GLint drawbuffer);
Error syncRendererState(); Error syncState();
Error syncRendererState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask); Error syncState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask);
Error syncRendererDirtyBits(); Error syncDirtyBits();
Error syncRendererDirtyBits(const State::DirtyBits &bitMask); Error syncDirtyBits(const State::DirtyBits &bitMask);
Error syncRendererDirtyObjects(); Error syncDirtyObjects();
Error syncRendererDirtyObjects(const State::DirtyObjects &objectMask); Error syncDirtyObjects(const State::DirtyObjects &objectMask);
Error syncStateForReadPixels(); Error syncStateForReadPixels();
Error syncStateForTexImage(); Error syncStateForTexImage();
Error syncStateForBlit(); Error syncStateForBlit();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment