Revert "No-Op draws when no active VS and/or FS is present"

src/libANGLE/Context.cpp

@@ -1124,7 +1124,6 @@ void Context::bindProgramPipeline(ProgramPipelineID pipelineHandle)
     ProgramPipeline *pipeline = mState.mProgramPipelineManager->checkProgramPipelineAllocation(
         mImplementation.get(), pipelineHandle);
     ANGLE_CONTEXT_TRY(mState.setProgramPipelineBinding(this, pipeline));
-    mStateCache.onProgramExecutableChange(this);
 }
 
 void Context::beginQuery(QueryType target, QueryID query)
@@ -8493,8 +8492,7 @@ StateCache::StateCache()
       mCachedInstancedVertexElementLimit(0),
       mCachedBasicDrawStatesError(kInvalidPointer),
       mCachedBasicDrawElementsError(kInvalidPointer),
-      mCachedTransformFeedbackActiveUnpaused(false),
-      mCachedCanDraw(false)
+      mCachedTransformFeedbackActiveUnpaused(false)
 {}
 
 StateCache::~StateCache() = default;
@@ -8515,7 +8513,6 @@ void StateCache::initialize(Context *context)
     updateBasicDrawStatesError();
     updateBasicDrawElementsError();
     updateVertexAttribTypesValidation(context);
-    updateCanDraw(context);
 }
 
 void StateCache::updateActiveAttribsMask(Context *context)
@@ -8627,7 +8624,6 @@ void StateCache::onProgramExecutableChange(Context *context)
     updateBasicDrawStatesError();
     updateValidDrawModes(context);
     updateActiveShaderStorageBufferIndices(context);
-    updateCanDraw(context);
 }
 
 void StateCache::onVertexArrayFormatChange(Context *context)
@@ -8889,11 +8885,4 @@ void StateCache::updateActiveShaderStorageBufferIndices(Context *context)
         }
     }
 }
-
-void StateCache::updateCanDraw(Context *context)
-{
-    mCachedCanDraw = (context->isGLES1() ||
-                      (context->getState().getProgramExecutable() &&
-                       context->getState().getProgramExecutable()->hasVertexAndFragmentShader()));
-}
 }  // namespace gl

src/libANGLE/Context.h

@@ -257,10 +257,6 @@ class StateCache final : angle::NonCopyable
         return mCachedActiveShaderStorageBufferIndices;
     }
 
-    // Places that can trigger updateCanDraw:
-    // 1. onProgramExecutableChange.
-    bool getCanDraw() const { return mCachedCanDraw; }
-
     // State change notifications.
     void onVertexArrayBindingChange(Context *context);
     void onProgramExecutableChange(Context *context);
@@ -294,7 +290,6 @@ class StateCache final : angle::NonCopyable
     void updateTransformFeedbackActiveUnpaused(Context *context);
     void updateVertexAttribTypesValidation(Context *context);
     void updateActiveShaderStorageBufferIndices(Context *context);
-    void updateCanDraw(Context *context);
 
     void setValidDrawModes(bool pointsOK, bool linesOK, bool trisOK, bool lineAdjOK, bool triAdjOK);
 
@@ -329,8 +324,6 @@ class StateCache final : angle::NonCopyable
                          VertexAttribTypeCase,
                          angle::EnumSize<VertexAttribType>() + 1>
         mCachedIntegerVertexAttribTypesValidation;
-
-    bool mCachedCanDraw;
 };
 
 using VertexArrayMap       = ResourceMap<VertexArray, VertexArrayID>;

src/libANGLE/Context.inl.h

@@ -66,11 +66,6 @@ ANGLE_INLINE void MarkShaderStorageBufferUsage(const Context *context)
 //  have a valid primitive for this mode (0 for points, 0-1 for lines, 0-2 for tris).
 ANGLE_INLINE bool Context::noopDraw(PrimitiveMode mode, GLsizei count)
 {
-    if (!mStateCache.getCanDraw())
-    {
-        return true;
-    }
-
     return count < kMinimumPrimitiveCounts[mode];
 }
 

src/libANGLE/Program.cpp

@@ -5464,7 +5464,6 @@ angle::Result Program::deserialize(const Context *context,
     mState.mExecutable.load(&stream);
 
     postResolveLink(context);
-    mState.mExecutable.updateCanDrawWith();
 
     return angle::Result::Continue;
 }

src/libANGLE/ProgramExecutable.cpp

@@ -24,8 +24,7 @@ ProgramExecutable::ProgramExecutable()
       mAttributesMask(0),
       mActiveSamplersMask(0),
       mActiveSamplerRefCounts{},
-      mActiveImagesMask(0),
-      mCanDrawWith(false)
+      mActiveImagesMask(0)
 {
     mActiveSamplerTypes.fill(TextureType::InvalidEnum);
     mActiveSamplerFormats.fill(SamplerFormat::InvalidEnum);
@@ -459,10 +458,4 @@ bool ProgramExecutable::linkValidateGlobalNames(InfoLog &infoLog) const
     return true;
 }
 
-void ProgramExecutable::updateCanDrawWith()
-{
-    mCanDrawWith =
-        (hasLinkedShaderStage(ShaderType::Vertex) && hasLinkedShaderStage(ShaderType::Fragment));
-}
-
 }  // namespace gl

src/libANGLE/ProgramExecutable.h

@@ -94,8 +94,6 @@ class ProgramExecutable
         {
             mLinkedGraphicsShaderStages.set(shaderType);
         }
-
-        updateCanDrawWith();
     }
     bool hasLinkedShaderStage(ShaderType shaderType) const
     {
@@ -167,9 +165,6 @@ class ProgramExecutable
 
     void setIsCompute(bool isComputeIn);
 
-    void updateCanDrawWith();
-    bool hasVertexAndFragmentShader() const { return mCanDrawWith; }
-
   private:
     // TODO(timvp): http://anglebug.com/3570: Investigate removing these friend
     // class declarations and accessing the necessary members with getters/setters.
@@ -209,8 +204,6 @@ class ProgramExecutable
     // Cached mask of active images.
     ActiveTextureMask mActiveImagesMask;
     ActiveTextureArray<ShaderBitSet> mActiveImageShaderBits;
-
-    bool mCanDrawWith;
 };
 
 }  // namespace gl

src/libANGLE/ProgramPipeline.cpp

@@ -287,8 +287,6 @@ void ProgramPipeline::updateLinkedShaderStages()
             mState.mExecutable.setLinkedShaderStages(shaderType);
         }
     }
-
-    mState.mExecutable.updateCanDrawWith();
 }
 
 void ProgramPipeline::updateExecutableAttributes()

src/libANGLE/validationES.cpp

@@ -2916,6 +2916,16 @@ const char *ValidateDrawStates(const Context *context)
 
         if (program)
         {
+            // In OpenGL ES spec for UseProgram at section 7.3, trying to render without
+            // vertex shader stage or fragment shader stage is a undefined behaviour.
+            // But ANGLE should clearly generate an INVALID_OPERATION error instead of
+            // produce undefined result.
+            if (!program->getExecutable().hasLinkedShaderStage(ShaderType::Vertex) ||
+                !program->getExecutable().hasLinkedShaderStage(ShaderType::Fragment))
+            {
+                return kNoActiveGraphicsShaderStage;
+            }
+
             if (!program->validateSamplers(nullptr, context->getCaps()))
             {
                 return kTextureTypeConflict;
@@ -2929,6 +2939,16 @@ const char *ValidateDrawStates(const Context *context)
         }
         else if (programPipeline)
         {
+            // In OpenGL ES spec for UseProgram at section 7.3, trying to render without
+            // vertex shader stage or fragment shader stage is a undefined behaviour.
+            // But ANGLE should clearly generate an INVALID_OPERATION error instead of
+            // produce undefined result.
+            if (!programPipeline->getExecutable().hasLinkedShaderStage(ShaderType::Vertex) ||
+                !programPipeline->getExecutable().hasLinkedShaderStage(ShaderType::Fragment))
+            {
+                return kNoActiveGraphicsShaderStage;
+            }
+
             const char *errorMsg = ValidateProgramPipelineAttachedPrograms(programPipeline);
             if (errorMsg)
             {
@@ -2946,6 +2966,10 @@ const char *ValidateDrawStates(const Context *context)
                 return errorMsg;
             }
         }
+        else
+        {
+            return kProgramNotBound;
+        }
 
         // Do some additional WebGL-specific validation
         if (extensions.webglCompatibility)

src/tests/gl_tests/ComputeShaderTest.cpp

@@ -296,7 +296,7 @@ void main()
 
     glUseProgram(program);
     glDrawArrays(GL_POINTS, 0, 2);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
 // Attach a vertex and fragment shader and link, but dispatch compute.

src/tests/gl_tests/LinkAndRelinkTest.cpp

@@ -37,7 +37,8 @@ class LinkAndRelinkTestES31 : public ANGLETest
 // or vice versa.
 
 // When program link fails and no valid rendering program is installed in the GL
-// state before the link, it should report an error for UseProgram
+// state before the link, it should report an error for UseProgram and
+// DrawArrays/DrawElements.
 TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithoutProgramInstalled)
 {
     glUseProgram(0);
@@ -52,7 +53,7 @@ TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithoutProgramInstalled)
     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
 // When program link or relink fails and a valid rendering program is installed
@@ -218,6 +219,7 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithoutProgramInstalled)
 // When program link or relink fails and a valid compute program is installed in
 // the GL state before the link, using the failed program via UseProgram should
 // report an error, but dispatching compute should succeed.
+// However, starting rendering always fails.
 TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
 {
     // Install a compute program in the GL state via UseProgram, then dispatch
@@ -250,7 +252,7 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     // Link failure, and a valid program has been installed in the GL state.
     GLuint programNull = glCreateProgram();
@@ -264,7 +266,7 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     // Using the unsuccessfully linked program should report an error.
     glUseProgram(programNull);
@@ -278,7 +280,7 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     // We try to relink the installed program, but make it fail.
 
@@ -294,7 +296,7 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     // Using the unsuccessfully relinked program should report an error.
     glUseProgram(program);
@@ -308,11 +310,11 @@ TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
 // If you compile and link a compute program successfully and use the program,
-// then dispatching compute and rendering can succeed (with undefined behavior).
+// then dispatching compute can succeed, while starting rendering will fail.
 // If you relink the compute program to a rendering program when it is in use,
 // then dispatching compute will fail, but starting rendering can succeed.
 TEST_P(LinkAndRelinkTestES31, RelinkProgramSucceedsFromComputeToRendering)
@@ -345,7 +347,7 @@ void main()
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 
     constexpr char kVS[] = "void main() {}";
     constexpr char kFS[] = "void main() {}";
@@ -439,7 +441,7 @@ void main()
     EXPECT_GL_NO_ERROR();
 
     glDrawArrays(GL_POINTS, 0, 1);
-    EXPECT_GL_NO_ERROR();
+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(LinkAndRelinkTest);