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

Cleanup dead declarations

Browse source
This commit is contained in:
Brad Davis 2018-08-23 12:22:39 -07:00
parent 35d86dd798
commit ac84a498b3
6 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/procedural/src/procedural/ShaderConstants.h
View file

@ -14,7 +14,6 @@
#ifndef PROCEDURAL_SHADER_CONSTANTS_H #ifndef PROCEDURAL_SHADER_CONSTANTS_H
#define PROCEDURAL_SHADER_CONSTANTS_H #define PROCEDURAL_SHADER_CONSTANTS_H
// Polyvox
#define PROCEDURAL_UNIFORM_TIME 200 #define PROCEDURAL_UNIFORM_TIME 200
#define PROCEDURAL_UNIFORM_DATE 201 #define PROCEDURAL_UNIFORM_DATE 201
#define PROCEDURAL_UNIFORM_FRAME_COUNT 202 #define PROCEDURAL_UNIFORM_FRAME_COUNT 202

1
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -32,7 +32,6 @@
namespace ru { namespace ru {
using render_utils::slot::texture::Texture; using render_utils::slot::texture::Texture;
using render_utils::slot::buffer::Buffer; using render_utils::slot::buffer::Buffer;
using render_utils::slot::uniform::Uniform;
} }
namespace gr { namespace gr {

2
libraries/render-utils/src/GeometryCache.cpp
View file

@ -2104,9 +2104,7 @@ void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
auto stateNoBlend = std::make_shared<gpu::State>(); auto stateNoBlend = std::make_shared<gpu::State>();
PrepareStencil::testMaskDrawShape(*stateNoBlend); PrepareStencil::testMaskDrawShape(*stateNoBlend);
auto noBlendPS = gpu::Shader::createVertex(shader::gpu::fragment::DrawTextureOpaque);
auto programNoBlend = gpu::Shader::createProgram(shader::render_utils::program::standardDrawTextureNoBlend); auto programNoBlend = gpu::Shader::createProgram(shader::render_utils::program::standardDrawTextureNoBlend);
_standardDrawPipelineNoBlend = gpu::Pipeline::create(programNoBlend, stateNoBlend); _standardDrawPipelineNoBlend = gpu::Pipeline::create(programNoBlend, stateNoBlend);
}); });

1
libraries/render-utils/src/HighlightEffect.cpp
View file

@ -28,7 +28,6 @@ using namespace render;
namespace ru { namespace ru {
using render_utils::slot::texture::Texture; using render_utils::slot::texture::Texture;
using render_utils::slot::buffer::Buffer; using render_utils::slot::buffer::Buffer;
using render_utils::slot::uniform::Uniform;
} }
namespace gr { namespace gr {

5
libraries/render-utils/src/render-utils/ShaderConstants.h
View file

@ -43,9 +43,6 @@
#define RENDER_UTILS_BUFFER_AMBIENT_LIGHT 6 #define RENDER_UTILS_BUFFER_AMBIENT_LIGHT 6
#define RENDER_UTILS_BUFFER_LIGHT_INDEX 7 #define RENDER_UTILS_BUFFER_LIGHT_INDEX 7
#define RENDER_UTILS_UNIFORM_LIGHT_RADIUS 0
#define RENDER_UTILS_UNIFORM_LIGHT_TEXCOORD_TRANSFORM 1
// Deferred lighting resolution // Deferred lighting resolution
#define RENDER_UTILS_TEXTURE_DEFERRRED_COLOR 0 #define RENDER_UTILS_TEXTURE_DEFERRRED_COLOR 0
#define RENDER_UTILS_TEXTURE_DEFERRRED_NORMAL 1 #define RENDER_UTILS_TEXTURE_DEFERRRED_NORMAL 1
@ -140,8 +137,6 @@ enum Uniform {
TextOutline = RENDER_UTILS_UNIFORM_TEXT_OUTLINE, TextOutline = RENDER_UTILS_UNIFORM_TEXT_OUTLINE,
TaaSharpenIntensity = GPU_UNIFORM_EXTRA0, TaaSharpenIntensity = GPU_UNIFORM_EXTRA0,
HighlightOutlineWidth = GPU_UNIFORM_EXTRA0, HighlightOutlineWidth = GPU_UNIFORM_EXTRA0,
LightRadius = RENDER_UTILS_UNIFORM_LIGHT_RADIUS,
TexcoordTransform = RENDER_UTILS_UNIFORM_LIGHT_TEXCOORD_TRANSFORM,
}; };
} }

1
libraries/render-utils/src/render-utils/fxaa.slp Normal file
View file

@ -0,0 +1 @@
VERTEX gpu::vertex::DrawUnitQuadTexcoord