Don't sync the read framebuffer on draw calls.
The read framebuffer may not be complete and be incapable of syncing.
Removed the generate syncDirtyObjects method so each caller must make sure they
are only syncing objects that are known to be valid for the operation.
BUG=angleproject:2737
Change-Id: Ia8edf3fca3a8369aa813be46ba99f6b50a36b2e6
Reviewed-on: https://chromium-review.googlesource.com/1151621
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 19d3100..eb91958 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -449,6 +449,14 @@
}
// Initialize dirty bit masks
+ mDrawDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+ mDrawDirtyObjects.set(State::DIRTY_OBJECT_VERTEX_ARRAY);
+ mDrawDirtyObjects.set(State::DIRTY_OBJECT_PROGRAM_TEXTURES);
+
+ mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+ mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_VERTEX_ARRAY);
+ mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_PROGRAM_TEXTURES);
+
mTexImageDirtyBits.set(State::DIRTY_BIT_UNPACK_STATE);
mTexImageDirtyBits.set(State::DIRTY_BIT_UNPACK_BUFFER_BINDING);
// No dirty objects.
@@ -2295,8 +2303,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilFillPath(pathObj, fillMode, mask);
}
@@ -2307,8 +2314,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilStrokePath(pathObj, reference, mask);
}
@@ -2319,8 +2325,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->coverFillPath(pathObj, coverMode);
}
@@ -2331,8 +2336,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->coverStrokePath(pathObj, coverMode);
}
@@ -2343,8 +2347,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilThenCoverFillPath(pathObj, fillMode, mask, coverMode);
}
@@ -2358,8 +2361,7 @@
if (!pathObj)
return;
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilThenCoverStrokePath(pathObj, reference, mask, coverMode);
}
@@ -2374,8 +2376,7 @@
{
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->coverFillPathInstanced(pathObjects, coverMode, transformType, transformValues);
}
@@ -2391,7 +2392,7 @@
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->coverStrokePathInstanced(pathObjects, coverMode, transformType,
transformValues);
@@ -2409,7 +2410,7 @@
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
// TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilFillPathInstanced(pathObjects, fillMode, mask, transformType,
transformValues);
@@ -2426,8 +2427,7 @@
{
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilStrokePathInstanced(pathObjects, reference, mask, transformType,
transformValues);
@@ -2445,8 +2445,7 @@
{
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilThenCoverFillPathInstanced(pathObjects, coverMode, fillMode, mask,
transformType, transformValues);
@@ -2464,8 +2463,7 @@
{
const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
- // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
- ANGLE_CONTEXT_TRY(syncState());
+ ANGLE_CONTEXT_TRY(syncStateForPathOperation());
mImplementation->stencilThenCoverStrokePathInstanced(pathObjects, coverMode, reference, mask,
transformType, transformValues);
@@ -3385,7 +3383,7 @@
ANGLE_TRY(mGLES1Renderer->prepareForDraw(mode, this, &mGLState));
}
- ANGLE_TRY(syncDirtyObjects());
+ ANGLE_TRY(syncDirtyObjects(mDrawDirtyObjects));
if (isRobustResourceInitEnabled())
{
@@ -3414,13 +3412,6 @@
return NoError();
}
-Error Context::syncState()
-{
- ANGLE_TRY(syncDirtyObjects());
- ANGLE_TRY(syncDirtyBits());
- return NoError();
-}
-
Error Context::syncState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask)
{
ANGLE_TRY(syncDirtyObjects(objectMask));
@@ -3444,11 +3435,6 @@
return NoError();
}
-Error Context::syncDirtyObjects()
-{
- return mGLState.syncDirtyObjects(this);
-}
-
Error Context::syncDirtyObjects(const State::DirtyObjects &objectMask)
{
return mGLState.syncDirtyObjects(this, objectMask);
@@ -4309,6 +4295,16 @@
return syncState(mBlitDirtyBits, mBlitDirtyObjects);
}
+Error Context::syncStateForPathOperation()
+{
+ ANGLE_TRY(syncDirtyObjects(mPathOperationDirtyObjects));
+
+ // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
+ ANGLE_TRY(syncDirtyBits());
+
+ return NoError();
+}
+
void Context::activeShaderProgram(GLuint pipeline, GLuint program)
{
UNIMPLEMENTED();