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

glsl/mesa: split gl_shader in two

Browse Source 
There are two distinctly different uses of this struct. The first
is to store GL shader objects. The second is to store information
about a shader stage thats been linked.

The two uses actually share few fields and there is clearly confusion
about their use. For example the linked shaders map one to one with
a program so can simply be destroyed along with the program. However
previously we were calling reference counting on the linked shaders.

We were also creating linked shaders with a name even though it
is always 0 and called the driver version of the _mesa_new_shader()
function unnecessarily for GL shader objects.

Acked-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Timothy Arceri
2016-06-30 14:55:40 +10:00
parent 378f07ccb5
commit 1fb8c6df88
58 changed files with 386 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/link_uniforms.cpp
View File

@@ -886,7 +886,7 @@ public:
* shaders).
*/
static void
link_update_uniform_buffer_variables(struct gl_shader *shader)
link_update_uniform_buffer_variables(struct gl_linked_shader *shader)
{
foreach_in_list(ir_instruction, node, shader->ir) {
ir_variable *const var = node->as_variable();
@@ -1022,7 +1022,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
struct string_to_uint_map *hiddenUniforms = new string_to_uint_map;
count_uniform_size uniform_size(prog->UniformHash, hiddenUniforms);
for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
struct gl_shader *sh = prog->_LinkedShaders[i];
struct gl_linked_shader *sh = prog->_LinkedShaders[i];
if (sh == NULL)
continue;
@@ -1204,7 +1204,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
continue;
for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) {
struct gl_shader *sh = prog->_LinkedShaders[j];
struct gl_linked_shader *sh = prog->_LinkedShaders[j];
if (!sh)
continue;
@@ -1234,7 +1234,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
if (uniforms[i].remap_location != UNMAPPED_UNIFORM_LOC)
continue;
for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) {
struct gl_shader *sh = prog->_LinkedShaders[j];
struct gl_linked_shader *sh = prog->_LinkedShaders[j];
if (!sh)
continue;