*
**************************************************************************/
-#include "main/imports.h"
+#include "util/imports.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "compiler/glsl/ir_uniform.h"
#include "st_program.h"
static void
-st_bind_atomics(struct st_context *st,
- struct gl_shader_program *prog,
- unsigned shader_type)
+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,
+ 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)
+ if (!prog || !st->pipe->set_shader_buffers || st->has_hw_atomics)
return;
- for (i = 0; i < prog->NumAtomicBuffers; i++) {
- struct gl_active_atomic_buffer *atomic = &prog->AtomicBuffers[i];
- struct gl_atomic_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 };
+ /* 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 pipe_shader_buffer sb;
- 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;
- }
+ 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;
}
-static void
-bind_vs_atomics(struct st_context *st)
+void
+st_bind_vs_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ 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);
}
-const struct st_tracked_state st_bind_vs_atomics = {
- "st_bind_vs_atomics",
- {
- 0,
- ST_NEW_VERTEX_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_vs_atomics
-};
-
-static void
-bind_fs_atomics(struct st_context *st)
+void
+st_bind_fs_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ 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);
}
-const struct st_tracked_state st_bind_fs_atomics = {
- "st_bind_fs_atomics",
- {
- 0,
- ST_NEW_FRAGMENT_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_fs_atomics
-};
-
-static void
-bind_gs_atomics(struct st_context *st)
+void
+st_bind_gs_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ 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);
}
-const struct st_tracked_state st_bind_gs_atomics = {
- "st_bind_gs_atomics",
- {
- 0,
- ST_NEW_GEOMETRY_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_gs_atomics
-};
-
-static void
-bind_tcs_atomics(struct st_context *st)
+void
+st_bind_tcs_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ 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);
}
-const struct st_tracked_state st_bind_tcs_atomics = {
- "st_bind_tcs_atomics",
- {
- 0,
- ST_NEW_TESSCTRL_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_tcs_atomics
-};
-
-static void
-bind_tes_atomics(struct st_context *st)
+void
+st_bind_tes_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ 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);
}
-const struct st_tracked_state st_bind_tes_atomics = {
- "st_bind_tes_atomics",
- {
- 0,
- ST_NEW_TESSEVAL_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_tes_atomics
-};
-
-static void
-bind_cs_atomics(struct st_context *st)
+void
+st_bind_cs_atomics(struct st_context *st)
{
- struct gl_shader_program *prog =
+ if (st->has_hw_atomics) {
+ st_bind_hw_atomic_buffers(st);
+ return;
+ }
+ 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);
}
-const struct st_tracked_state st_bind_cs_atomics = {
- "st_bind_cs_atomics",
- {
- 0,
- ST_NEW_COMPUTE_PROGRAM | ST_NEW_ATOMIC_BUFFER,
- },
- bind_cs_atomics
-};
+void
+st_bind_hw_atomic_buffers(struct st_context *st)
+{
+ struct pipe_shader_buffer buffers[PIPE_MAX_HW_ATOMIC_BUFFERS];
+ int i;
+
+ if (!st->has_hw_atomics)
+ return;
+
+ 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);
+}
projects / mesa.git / blobdiff