From c73ccbc5616dff16ecacb9198f725f498a7e6c84 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 20 Apr 2018 14:59:17 -0400 Subject: 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. --- tools/render-test/render-gl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/render-test/render-gl.cpp') 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); -- cgit v1.2.3