OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: add ARB_uniform_buffer_object support (v2)

Browse Source 
this adds UBO support to the state tracker, it works with softpipe
as-is.

It uses UARL + CONST[x][ADDR[0].x] type constructs.

v2: don't disable UBOs if geom shaders don't exist (me)
rename upload to bind (calim)
fix 12 -> 13 comparison as comment (calim + brianp)
fix signed->unsigned (Brian)
remove assert (Brian)

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-12-06 16:16:10 +10:00
parent 535e248c5f
commit 73ae865af8
6 changed files with 147 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/mesa/state_tracker/st_atom_constbuf.c
View File

@@ -45,7 +45,7 @@
#include "st_atom.h"
#include "st_atom_constbuf.h"
#include "st_program.h"
#include "st_cb_bufferobjects.h"
/**
* Pass the given program parameters to the graphics pipe as a
@@ -175,3 +175,69 @@ const struct st_tracked_state st_update_gs_constants = {
},
update_gs_constants /* update */
};
static void st_bind_ubos(struct st_context *st,
struct gl_shader *shader,
unsigned shader_type)
{
unsigned i;
struct pipe_constant_buffer cb = { 0 };
if (!shader)
return;
for (i = 0; i < shader->NumUniformBlocks; i++) {
struct gl_uniform_buffer_binding *binding;
struct st_buffer_object *st_obj;
binding = &st->ctx->UniformBufferBindings[shader->UniformBlocks[i].Binding];
st_obj = st_buffer_object(binding->BufferObject);
pipe_resource_reference(&cb.buffer, st_obj->buffer);
cb.buffer_size = st_obj->buffer->width0 - binding->Offset;
st->pipe->set_constant_buffer(st->pipe, shader_type, 1 + i, &cb);
pipe_resource_reference(&cb.buffer, NULL);
}
}
static void bind_vs_ubos(struct st_context *st)
{
struct gl_shader_program *prog = st->ctx->Shader.CurrentVertexProgram;
if (!prog)
return;
st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_VERTEX], PIPE_SHADER_VERTEX);
}
const struct st_tracked_state st_bind_vs_ubos = {
"st_bind_vs_ubos",
{
(_NEW_PROGRAM | _NEW_BUFFER_OBJECT),
ST_NEW_VERTEX_PROGRAM,
},
bind_vs_ubos
};
static void bind_fs_ubos(struct st_context *st)
{
struct gl_shader_program *prog = st->ctx->Shader.CurrentFragmentProgram;
if (!prog)
return;
st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_FRAGMENT], PIPE_SHADER_FRAGMENT);
}
const struct st_tracked_state st_bind_fs_ubos = {
"st_bind_fs_ubos",
{
(_NEW_PROGRAM | _NEW_BUFFER_OBJECT),
ST_NEW_FRAGMENT_PROGRAM,
},
bind_fs_ubos
};