st: expose KHR_blend_equation_advanced if PIPE_CAP_BLEND_EQUATION_ADVANCED

[mesa.git] / src / mesa / state_tracker / st_atom_atomicbuf.c

diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c
index eda9e51b58140332287460f60237fb13ef158342..2121e85e60969427d20c83723383d0aada9fa6f7 100644 (file)
--- a/src/mesa/state_tracker/st_atom_atomicbuf.c
+++ b/src/mesa/state_tracker/st_atom_atomicbuf.c
@@ -24,7 +24,7 @@
  *
  **************************************************************************/
 
-#include "main/imports.h"
+
 #include "program/prog_parameter.h"
 #include "program/prog_print.h"
 #include "compiler/glsl/ir_uniform.h"
@@ -40,39 +40,57 @@
 #include "st_atom.h"
 #include "st_program.h"
 
+static void
+st_binding_to_sb(struct gl_buffer_binding *binding,
+                 struct pipe_shader_buffer *sb)
+{
+   struct st_buffer_object *st_obj =
+      st_buffer_object(binding->BufferObject);
+
+   if (st_obj && st_obj->buffer) {
+     sb->buffer = st_obj->buffer;
+     sb->buffer_offset = binding->Offset;
+     sb->buffer_size = st_obj->buffer->width0 - binding->Offset;
+
+     /* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
+      * Take the minimum just to be sure.
+      */
+     if (!binding->AutomaticSize)
+       sb->buffer_size = MIN2(sb->buffer_size, (unsigned) binding->Size);
+   } else {
+     sb->buffer = NULL;
+     sb->buffer_offset = 0;
+     sb->buffer_size = 0;
+   }
+}
+
 static void
 st_bind_atomics(struct st_context *st, struct gl_program *prog,
-                enum pipe_shader_type shader_type)
+                gl_shader_stage stage)
 {
    unsigned i;
+   enum pipe_shader_type shader_type = pipe_shader_type_from_mesa(stage);
 
    if (!prog || !st->pipe->set_shader_buffers || st->has_hw_atomics)
       return;
 
+   /* For !has_hw_atomics, the atomic counters have been rewritten to be above
+    * the SSBOs used by the program.
+    */
+   unsigned buffer_base = prog->info.num_ssbos;
+   unsigned used_bindings = 0;
    for (i = 0; i < prog->sh.data->NumAtomicBuffers; i++) {
       struct gl_active_atomic_buffer *atomic =
          &prog->sh.data->AtomicBuffers[i];
-      struct gl_buffer_binding *binding =
-         &st->ctx->AtomicBufferBindings[atomic->Binding];
-      struct st_buffer_object *st_obj =
-         st_buffer_object(binding->BufferObject);
-      struct pipe_shader_buffer sb = { 0 };
-
-      if (st_obj && st_obj->buffer) {
-         sb.buffer = st_obj->buffer;
-         sb.buffer_offset = binding->Offset;
-         sb.buffer_size = st_obj->buffer->width0 - binding->Offset;
-
-         /* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
-          * Take the minimum just to be sure.
-          */
-         if (!binding->AutomaticSize)
-            sb.buffer_size = MIN2(sb.buffer_size, (unsigned) binding->Size);
-      }
+      struct pipe_shader_buffer sb;
+
+      st_binding_to_sb(&st->ctx->AtomicBufferBindings[atomic->Binding], &sb);
 
       st->pipe->set_shader_buffers(st->pipe, shader_type,
-                                   atomic->Binding, 1, &sb);
+                                   buffer_base + atomic->Binding, 1, &sb, 0x1);
+      used_bindings = MAX2(atomic->Binding + 1, used_bindings);
    }
+   st->last_used_atomic_bindings[shader_type] = used_bindings;
 }
 
 void
@@ -81,7 +99,7 @@ st_bind_vs_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_VERTEX);
+   st_bind_atomics(st, prog, MESA_SHADER_VERTEX);
 }
 
 void
@@ -90,7 +108,7 @@ st_bind_fs_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_FRAGMENT];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_FRAGMENT);
+   st_bind_atomics(st, prog, MESA_SHADER_FRAGMENT);
 }
 
 void
@@ -99,7 +117,7 @@ st_bind_gs_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_GEOMETRY);
+   st_bind_atomics(st, prog, MESA_SHADER_GEOMETRY);
 }
 
 void
@@ -108,7 +126,7 @@ st_bind_tcs_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_CTRL];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_TESS_CTRL);
+   st_bind_atomics(st, prog, MESA_SHADER_TESS_CTRL);
 }
 
 void
@@ -117,7 +135,7 @@ st_bind_tes_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_EVAL];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_TESS_EVAL);
+   st_bind_atomics(st, prog, MESA_SHADER_TESS_EVAL);
 }
 
 void
@@ -130,7 +148,7 @@ st_bind_cs_atomics(struct st_context *st)
    struct gl_program *prog =
       st->ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE];
 
-   st_bind_atomics(st, prog, PIPE_SHADER_COMPUTE);
+   st_bind_atomics(st, prog, MESA_SHADER_COMPUTE);
 }
 
 void
@@ -142,27 +160,8 @@ st_bind_hw_atomic_buffers(struct st_context *st)
    if (!st->has_hw_atomics)
       return;
 
-   for (i = 0; i < st->ctx->Const.MaxAtomicBufferBindings; i++) {
-      struct gl_buffer_binding *binding = &st->ctx->AtomicBufferBindings[i];
-      struct st_buffer_object *st_obj = st_buffer_object(binding->BufferObject);
-      struct pipe_shader_buffer *sb = &buffers[i];
-
-      if (st_obj && st_obj->buffer) {
-        sb->buffer = st_obj->buffer;
-        sb->buffer_offset = binding->Offset;
-        sb->buffer_size = st_obj->buffer->width0 - binding->Offset;
-
-        /* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
-         * Take the minimum just to be sure.
-         */
-        if (!binding->AutomaticSize)
-          sb->buffer_size = MIN2(sb->buffer_size, (unsigned) binding->Size);
-      } else {
-        sb->buffer = NULL;
-        sb->buffer_offset = 0;
-        sb->buffer_size = 0;
-      }
-   }
+   for (i = 0; i < st->ctx->Const.MaxAtomicBufferBindings; i++)
+      st_binding_to_sb(&st->ctx->AtomicBufferBindings[i], &buffers[i]);
 
    st->pipe->set_hw_atomic_buffers(st->pipe, 0, st->ctx->Const.MaxAtomicBufferBindings, buffers);
 }