ES31: Fix incorrect error code in DispatchComputeIndirect

INVALID_VALUE error should be generated not INVALID_OPERATION if indirect is not a multiple of the size, in basic machine units, of uint. Meanwhile, we put the validation of indirect before indirect buffer so that the corresponding deqp cases can pass. BUG=angleproject:2324 Change-Id: I223ec1893a6dd613f84e51a98f02d5f79482952f Reviewed-on: https://chromium-review.googlesource.com/929900Reviewed-by: Jiawei Shao <jiawei.shao@intel.com> Reviewed-by: Yunchao He <yunchao.he@intel.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

ES31: Fix incorrect error code in DispatchComputeIndirect
a4ef843f · Qin Jiajia · Commit Bot · 76bf01d7 · a4ef843f · a4ef843f
Commit a4ef843f authored Feb 22, 2018 by Qin Jiajia Committed by Commit Bot Feb 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

validationES31.cpp src/libANGLE/validationES31.cpp +7 -7

deqp_gles31_test_expectations.txt src/tests/deqp_support/deqp_gles31_test_expectations.txt +0 -1

No files found.
--- a/src/libANGLE/validationES31.cpp
+++ b/src/libANGLE/validationES31.cpp
@@ -1431,22 +1431,22 @@ bool ValidateDispatchComputeIndirect(Context *context, GLintptr indirect)
        return false;
    }
-    gl::Buffer *dispatchIndirectBuffer = state.getTargetBuffer(BufferBinding::DispatchIndirect);
+    if (indirect < 0)
-    if (!dispatchIndirectBuffer)
    {
-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), DispatchIndirectBufferNotBound);
+        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
        return false;
    }
-    if (indirect < 0)
+    if ((indirect & (sizeof(GLuint) - 1)) != 0)
    {
-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
+        ANGLE_VALIDATION_ERR(context, InvalidValue(), OffsetMustBeMultipleOfUint);
        return false;
    }
-    if ((indirect & (sizeof(GLuint) - 1)) != 0)
+    gl::Buffer *dispatchIndirectBuffer = state.getTargetBuffer(BufferBinding::DispatchIndirect);
+    if (!dispatchIndirectBuffer)
    {
-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), OffsetMustBeMultipleOfUint);
+        ANGLE_VALIDATION_ERR(context, InvalidOperation(), DispatchIndirectBufferNotBound);
        return false;
    }

--- a/src/tests/deqp_support/deqp_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles31_test_expectations.txt
@@ -1679,7 +1679,6 @@
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.log.compute.program_not_active = FAIL
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.program_not_active = FAIL
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.invalid_program_query = FAIL
-2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.invalid_dispatch_compute_indirect = FAIL
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_storage.block_number_limits = FAIL
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.log.shader_storage.block_number_limits = FAIL
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_storage.block_number_limits = FAIL