diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
| commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
| tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /mesalib/src/mesa/state_tracker/st_atom_constbuf.c | |
| parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
| parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
| download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_constbuf.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_constbuf.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c index 723ab561c..f3c457625 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c +++ b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c @@ -254,4 +254,21 @@ const struct st_tracked_state st_bind_fs_ubos = { bind_fs_ubos }; +static void bind_gs_ubos(struct st_context *st) +{ + struct gl_shader_program *prog = st->ctx->Shader.CurrentGeometryProgram; + + if (!prog) + return; + + st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_GEOMETRY], PIPE_SHADER_GEOMETRY); +} +const struct st_tracked_state st_bind_gs_ubos = { + "st_bind_gs_ubos", + { + 0, + ST_NEW_GEOMETRY_PROGRAM | ST_NEW_UNIFORM_BUFFER, + }, + bind_gs_ubos +}; |