Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 04:31:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing the program map sorting, good to go

Browse source
This commit is contained in:
Sam Gateau 2018-01-31 21:32:22 -08:00
parent 89f4fe1c04
commit edb416d24e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gpu/src/gpu/Shader.cpp
View file

@ -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) { Shader::Pointer Shader::createProgram(const Pointer& vertexShader, const Pointer& geometryShader, const Pointer& pixelShader) {
return createOrReuseProgramShader(PROGRAM, vertexShader, geometryShader, 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) { void Shader::defineSlots(const SlotSet& uniforms, const SlotSet& uniformBuffers, const SlotSet& resourceBuffers, const SlotSet& textures, const SlotSet& samplers, const SlotSet& inputs, const SlotSet& outputs) {

4
libraries/gpu/src/gpu/Shader.h
View file

@ -259,10 +259,10 @@ protected:
bool operator() (const ProgramMapKey& l, const ProgramMapKey& r) const { bool operator() (const ProgramMapKey& l, const ProgramMapKey& r) const {
if (l.x == r.x) { if (l.x == r.x) {
if (l.y == r.y) { if (l.y == r.y) {
return (l.z < l.z); return (l.z < r.z);
} }
else { else {
return (l.y < l.y); return (l.y < r.y);
} }
} }
else { else {