diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-04-20 14:59:17 -0400 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-04-20 11:59:17 -0700 |
| commit | c73ccbc5616dff16ecacb9198f725f498a7e6c84 (patch) | |
| tree | 539d28904ecb6970632a396aa6f914d47b9b1175 /tools/render-test/render-gl.cpp | |
| parent | 4c751df1680c30fac0369171a9b8dd4bb5bb5b9f (diff) | |
Fixes/improvements based on feature/render-binding-resource (#511)
* Dx12 rendering works in test framework.
* Turn on dx12 render tests.
* Split out functions for construction or Renderer types into ShaderRendererUtil. Removed the serialization of buffers code into test-render
* Improvements in documentation and typename in BindingState types.
RegisterSet -> CompactBindIndexSlice
RegisterList -> BindIndexSlice
RegisterDesc -> ShaderBindSet
* Fix debug build break.
Diffstat (limited to 'tools/render-test/render-gl.cpp')
| -rw-r--r-- | tools/render-test/render-gl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/render-test/render-gl.cpp b/tools/render-test/render-gl.cpp index 8db963014..10e25fdcd 100644 --- a/tools/render-test/render-gl.cpp +++ b/tools/render-test/render-gl.cpp @@ -928,7 +928,7 @@ BindingState* GLRenderer::createBindingState(const BindingState::Desc& bindingSt const auto& srcBinding = srcBindings[i]; // Copy over the bindings - dstDetail.m_firstBinding = bindingStateDesc.getFirst(BindingState::ShaderStyle::Glsl, srcBinding.registerDesc); + dstDetail.m_firstBinding = bindingStateDesc.getFirst(BindingState::ShaderStyle::Glsl, srcBinding.shaderBindSet); switch (srcBinding.bindingType) { @@ -1013,7 +1013,7 @@ void GLRenderer::setBindingState(BindingState* stateIn) } case BindingType::Sampler: { - auto bindings = bindingDesc.asRegisterList(BindingState::ShaderStyle::Glsl, binding.registerDesc); + auto bindings = bindingDesc.asSlice(BindingState::ShaderStyle::Glsl, binding.shaderBindSet); for (auto b : bindings) { glBindSampler(b, detail.m_samplerHandle); |