diff options
| author | Ian Romanick <[email protected]> | 2014-07-14 15:48:36 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-08-29 23:27:59 -0700 |
| commit | c0cd5bedf66887e958e140c047afc5bc26160000 (patch) | |
| tree | 3ce0ea5f0270e2944760f0bed70f9a75baeef685 /src/glsl | |
| parent | 941269f89c147a606787a10e41959ede98da5df6 (diff) | |
glsl: Eliminate ir_variable::data.atomic.buffer_index
Just use ir_variable::data.binding... because that's the where the
binding is stored for everything else that can use layout(binding=).
Valgrind massif results for a trimmed apitrace of dota2:
n time(i) total(B) useful-heap(B) extra-heap(B) stacks(B)
Before (32-bit): 50 40,564,927,443 69,185,408 63,683,871 5,501,537 0
After (32-bit): 74 40,580,119,657 69,186,544 63,506,327 5,680,217 0
Before (64-bit): 59 36,822,048,449 96,526,888 89,113,000 7,413,888 0
After (64-bit): 89 36,822,971,897 96,526,616 88,735,296 7,791,320 0
A real savings of 173KiB on 32-bit and 368KiB on 64-bit.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/ir.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/ir.h | 3 | ||||
| -rw-r--r-- | src/glsl/link_atomics.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 4a4d30477ce..d09ff9e5ffa 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1551,6 +1551,7 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name, this->data.has_initializer = false; this->data.location = -1; this->data.location_frac = 0; + this->data.binding = 0; this->warn_extension = NULL; this->constant_value = NULL; this->constant_initializer = NULL; @@ -1566,7 +1567,6 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name, this->data.mode = mode; this->data.interpolation = INTERP_QUALIFIER_NONE; this->data.max_array_access = 0; - this->data.atomic.buffer_index = 0; this->data.atomic.offset = 0; this->data.image.read_only = false; this->data.image.write_only = false; diff --git a/src/glsl/ir.h b/src/glsl/ir.h index 18623b96868..535693d9273 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -727,7 +727,7 @@ public: int index; /** - * Initial binding point for a sampler or UBO. + * Initial binding point for a sampler, atomic, or UBO. * * For array types, this represents the binding point for the first element. */ @@ -737,7 +737,6 @@ public: * Location an atomic counter is stored at. */ struct { - unsigned buffer_index; unsigned offset; } atomic; diff --git a/src/glsl/link_atomics.cpp b/src/glsl/link_atomics.cpp index 75699fd9391..603873a5d4f 100644 --- a/src/glsl/link_atomics.cpp +++ b/src/glsl/link_atomics.cpp @@ -201,7 +201,9 @@ link_assign_atomic_counter_resources(struct gl_context *ctx, gl_uniform_storage *const storage = &prog->UniformStorage[id]; mab.Uniforms[j] = id; - var->data.atomic.buffer_index = i; + if (!var->data.explicit_binding) + var->data.binding = i; + storage->atomic_buffer_index = i; storage->offset = var->data.atomic.offset; storage->array_stride = (var->type->is_array() ? |