From d8ff133cc681df28b6bb471c257c12c14e726d46 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 5 Jan 2016 18:11:24 -0800 Subject: [PATCH] Fix include in gpu-test --- libraries/render-utils/src/DeferredLightingEffect.h | 4 ++-- tests/gpu-test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h index e0926fb5b8..40800258de 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.h +++ b/libraries/render-utils/src/DeferredLightingEffect.h @@ -21,7 +21,7 @@ #include "model/Stage.h" #include "model/Geometry.h" -#include "ShapeRender.h" +#include "render/Shape.h" class RenderArgs; class SimpleProgramKey; @@ -32,7 +32,7 @@ class DeferredLightingEffect : public Dependency { SINGLETON_DEPENDENCY public: - static const int NORMAL_FITTING_MAP_SLOT = ShapeRender::Slot::NORMAL_FITTING_MAP; + static const int NORMAL_FITTING_MAP_SLOT = render::Shape::Slot::NORMAL_FITTING_MAP; static const int DEFERRED_TRANSFORM_BUFFER_SLOT = 2; void init(); diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt index 3d83c310cf..6b985da4c9 100644 --- a/tests/gpu-test/CMakeLists.txt +++ b/tests/gpu-test/CMakeLists.txt @@ -3,5 +3,5 @@ AUTOSCRIBE_SHADER_LIB(gpu model render-utils) # This is not a testcase -- just set it up as a regular hifi project setup_hifi_project(Quick Gui OpenGL Script Widgets) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") -link_hifi_libraries(networking gl gpu procedural shared fbx model model-networking animation script-engine render-utils ) +link_hifi_libraries(networking gl gpu procedural shared fbx model model-networking animation script-engine render render-utils ) package_libraries_for_deployment() \ No newline at end of file