1 files changed, 16 insertions, 29 deletions

diff --git a/src/mesa/main/compute.c b/src/mesa/main/compute.c
index 37a4ba70eed..8bc3bcd25a0 100644
--- a/src/mesa/main/compute.c
+++ b/src/mesa/main/compute.c
@@ -24,6 +24,7 @@
 #include "glheader.h"
 #include "compute.h"
 #include "context.h"
+#include "api_validate.h"
 
 void GLAPIENTRY
 _mesa_DispatchCompute(GLuint num_groups_x,
@@ -31,31 +32,16 @@ _mesa_DispatchCompute(GLuint num_groups_x,
                       GLuint num_groups_z)
 {
    GET_CURRENT_CONTEXT(ctx);
-   int i;
-   struct gl_shader_program *prog;
    const GLuint num_groups[3] = { num_groups_x, num_groups_y, num_groups_z };
 
-   if (ctx->Extensions.ARB_compute_shader) {
-      for (i = 0; i < 3; i++) {
-         if (num_groups[i] > ctx->Const.MaxComputeWorkGroupCount[i]) {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glDispatchCompute(num_groups_%c)", 'x' + i);
-            return;
-         }
-      }
-      if (!_mesa_valid_to_render(ctx, "glDispatchCompute"))
-         return;
-      prog = ctx->Shader.CurrentProgram[MESA_SHADER_COMPUTE];
-      if (prog == NULL || prog->_LinkedShaders[MESA_SHADER_COMPUTE] == NULL) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glDispatchCompute(no active compute shader)");
-         return;
-      }
-      ctx->Driver.DispatchCompute(ctx, num_groups);
-   } else {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "unsupported function (glDispatchCompute) called");
-   }
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDispatchCompute(%d, %d, %d)\n",
+                  num_groups_x, num_groups_y, num_groups_z);
+
+   if (!_mesa_validate_DispatchCompute(ctx, num_groups))
+      return;
+
+   ctx->Driver.DispatchCompute(ctx, num_groups);
 }
 
 extern void GLAPIENTRY
@@ -63,10 +49,11 @@ _mesa_DispatchComputeIndirect(GLintptr indirect)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (ctx->Extensions.ARB_compute_shader) {
-      assert(!"TODO");
-   } else {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "unsupported function (glDispatchComputeIndirect) called");
-   }
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDispatchComputeIndirect(%d)\n", indirect);
+
+   if (!_mesa_validate_DispatchComputeIndirect(ctx, indirect))
+      return;
+
+   ctx->Driver.DispatchComputeIndirect(ctx, indirect);
 }