diff options
author | Timothy Arceri <[email protected]> | 2016-11-04 10:10:19 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2016-12-30 10:57:16 +1100 |
commit | 8417bf528eb155028d56acaa4cbe05eb3536093b (patch) | |
tree | edcbf49a81acdabde3244f0314fb1e9ddeec8040 /src/compiler/glsl/linker.cpp | |
parent | 3177eef39277b64af3213603b58ff934b5218e39 (diff) |
mesa/glsl: move BlendSupport bitfield to gl_program
This will let us to make _CurrentFragmentProgram a gl_program pointer
allowing for simpilifications to be made.
We also need to add a field to gl_shader to hold it during parsing.
In gl_program we put it inside a union in anticipation of moving
more fields here that can be only fs or vertex stage fields.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler/glsl/linker.cpp')
-rw-r--r-- | src/compiler/glsl/linker.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 209129c3ea0..3726f669730 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1829,7 +1829,6 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->info.uses_gl_fragcoord = false; linked_shader->info.origin_upper_left = false; linked_shader->info.pixel_center_integer = false; - linked_shader->info.BlendSupport = 0; if (linked_shader->Stage != MESA_SHADER_FRAGMENT || (prog->data->Version < 150 && @@ -1894,7 +1893,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->Program->info.fs.post_depth_coverage |= shader->info.PostDepthCoverage; - linked_shader->info.BlendSupport |= shader->info.BlendSupport; + linked_shader->Program->sh.fs.BlendSupport |= shader->BlendSupport; } } |