From 09347bad62dcf65fe77f3e4036e52c63cbd70cf9 Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 14 Nov 2013 12:34:01 +0300 Subject: [PATCH] [drape] remove shaders moc files from repo --- .gitignore | 7 ++- drape/drape_tests/enum_shaders.hpp | 18 ------ drape/shader_def.cpp | 96 ------------------------------ drape/shader_def.hpp | 22 ------- 4 files changed, 6 insertions(+), 137 deletions(-) delete mode 100644 drape/drape_tests/enum_shaders.hpp delete mode 100644 drape/shader_def.cpp delete mode 100644 drape/shader_def.hpp diff --git a/.gitignore b/.gitignore index 97719a4b68..a144377ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -174,4 +174,9 @@ tools/twine/.git syntax: regexp (.*/)?\#[^/]*\#$ android/YoPme/.gradletasknamecache -android/.gradletasknamecache \ No newline at end of file +android/.gradletasknamecache + +# shader preprocessing moc files +drape/shader_def.hpp +drape/shader_def.cpp +drape/drape_tests/enum_shaders.hpp diff --git a/drape/drape_tests/enum_shaders.hpp b/drape/drape_tests/enum_shaders.hpp deleted file mode 100644 index d5fdde7bf4..0000000000 --- a/drape/drape_tests/enum_shaders.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "../../std/vector.hpp" -#include "../../std/string.hpp" - -namespace gpu_test -{ - vector VertexEnum; - vector FragmentEnum; - - void InitEnumeration() - { - VertexEnum.push_back("/Users/ExMix/develop/omim/drape/shaders/simple_vertex_shader.vsh"); - VertexEnum.push_back("/Users/ExMix/develop/omim/drape/shaders/texturing_vertex_shader.vsh"); - FragmentEnum.push_back("/Users/ExMix/develop/omim/drape/shaders/solid_area_fragment_shader.fsh"); - FragmentEnum.push_back("/Users/ExMix/develop/omim/drape/shaders/texturing_fragment_shader.fsh"); - } -} diff --git a/drape/shader_def.cpp b/drape/shader_def.cpp deleted file mode 100644 index 6c1bec7b0b..0000000000 --- a/drape/shader_def.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "shader_def.hpp" - -#include "../std/utility.hpp" - - -#if defined(OMIM_OS_DESKTOP) - #define LOW_P - #define MEDIUM_P - #define HIGH_P -#else - #define LOW_P lowp - #define MEDIUM_P mediump - #define HIGH_P highp -#endif - -namespace gpu -{ - static const char SIMPLE_VERTEX_SHADER_VSH[] = " \ - attribute vec2 position; \ - attribute float depth; \ - \ - uniform mat4 modelView; \ - uniform mat4 projection; \ - \ - void main(void) \ - { \ - gl_Position = vec4(position, depth, 1.0) * modelView * projection; \ - } \ - "; - - static const char SOLID_AREA_FRAGMENT_SHADER_FSH[] = " \ - uniform " LOW_P " vec4 color; \ - \ - void main(void) \ - { \ - gl_FragColor = color; \ - } \ - "; - - static const char TEXTURING_FRAGMENT_SHADER_FSH[] = " \ - uniform sampler2D textureUnit; \ - varying " HIGH_P " vec4 varTexCoords; \ - \ - void main(void) \ - { \ - gl_FragColor = texture2D(textureUnit, varTexCoords.st); \ - } \ - "; - - static const char TEXTURING_VERTEX_SHADER_VSH[] = " \ - attribute " MEDIUM_P " vec2 position; \ - attribute " MEDIUM_P " float depth; \ - attribute " MEDIUM_P " vec4 texCoords; \ - \ - uniform " HIGH_P " mat4 modelViewProjectionMatrix; \ - \ - varying " HIGH_P " vec4 varTexCoords; \ - \ - void main(void) \ - { \ - gl_Position = modelViewProjectionMatrix * vec4(position, depth, 1.0); \ - varTexCoords = texCoords; \ - } \ - "; - - //---------------------------------------------// - #define SIMPLE_VERTEX_SHADER_VSH_INDEX 0 - #define SOLID_AREA_FRAGMENT_SHADER_FSH_INDEX 1 - #define TEXTURING_FRAGMENT_SHADER_FSH_INDEX 2 - #define TEXTURING_VERTEX_SHADER_VSH_INDEX 3 - //---------------------------------------------// - const int SOLID_AREA_PROGRAM = 1; - const int TEXTURING_PROGRAM = 0; - //---------------------------------------------// - - ProgramInfo::ProgramInfo() - : m_vertexIndex(-1) - , m_fragmentIndex(-1) - , m_vertexSource(NULL) - , m_fragmentSource(NULL) {} - - ProgramInfo::ProgramInfo(int vertexIndex, int fragmentIndex, - const char * vertexSource, const char * fragmentSource) - : m_vertexIndex(vertexIndex) - , m_fragmentIndex(fragmentIndex) - , m_vertexSource(vertexSource) - , m_fragmentSource(fragmentSource) - { - } - - void InitGpuProgramsLib(map & gpuIndex) - { - gpuIndex.insert(make_pair(TEXTURING_PROGRAM, ProgramInfo(TEXTURING_VERTEX_SHADER_VSH_INDEX, TEXTURING_FRAGMENT_SHADER_FSH_INDEX, TEXTURING_VERTEX_SHADER_VSH, TEXTURING_FRAGMENT_SHADER_FSH))); - gpuIndex.insert(make_pair(SOLID_AREA_PROGRAM, ProgramInfo(SIMPLE_VERTEX_SHADER_VSH_INDEX, SOLID_AREA_FRAGMENT_SHADER_FSH_INDEX, SIMPLE_VERTEX_SHADER_VSH, SOLID_AREA_FRAGMENT_SHADER_FSH))); - } -} diff --git a/drape/shader_def.hpp b/drape/shader_def.hpp deleted file mode 100644 index 805857bdb2..0000000000 --- a/drape/shader_def.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "../std/map.hpp" - -namespace gpu -{ - struct ProgramInfo - { - ProgramInfo(); - ProgramInfo(int vertexIndex, int fragmentIndex, - const char * vertexSource, const char * fragmentSource); - int m_vertexIndex; - int m_fragmentIndex; - const char * m_vertexSource; - const char * m_fragmentSource; - }; - - extern const int SOLID_AREA_PROGRAM; - extern const int TEXTURING_PROGRAM; - - void InitGpuProgramsLib(map & gpuIndex); -}