From edb416d24eacc2046d46f1f13c16d54d408cc343 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 31 Jan 2018 21:32:22 -0800 Subject: [PATCH] Fixing the program map sorting, good to go --- libraries/gpu/src/gpu/Shader.cpp | 1 - libraries/gpu/src/gpu/Shader.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/gpu/src/gpu/Shader.cpp b/libraries/gpu/src/gpu/Shader.cpp index 649e7d9e66..e428c758b1 100755 --- a/libraries/gpu/src/gpu/Shader.cpp +++ b/libraries/gpu/src/gpu/Shader.cpp @@ -122,7 +122,6 @@ Shader::Pointer Shader::createProgram(const Pointer& vertexShader, const Pointer Shader::Pointer Shader::createProgram(const Pointer& vertexShader, const Pointer& geometryShader, const Pointer& pixelShader) { return createOrReuseProgramShader(PROGRAM, vertexShader, geometryShader, pixelShader); - } void Shader::defineSlots(const SlotSet& uniforms, const SlotSet& uniformBuffers, const SlotSet& resourceBuffers, const SlotSet& textures, const SlotSet& samplers, const SlotSet& inputs, const SlotSet& outputs) { diff --git a/libraries/gpu/src/gpu/Shader.h b/libraries/gpu/src/gpu/Shader.h index 1e251e6f67..b7ca000d43 100755 --- a/libraries/gpu/src/gpu/Shader.h +++ b/libraries/gpu/src/gpu/Shader.h @@ -259,10 +259,10 @@ protected: bool operator() (const ProgramMapKey& l, const ProgramMapKey& r) const { if (l.x == r.x) { if (l.y == r.y) { - return (l.z < l.z); + return (l.z < r.z); } else { - return (l.y < l.y); + return (l.y < r.y); } } else {