From 9e99cfe1194ac6979a2d367d7b52c59152d27b9a Mon Sep 17 00:00:00 2001 From: halx99 Date: Wed, 4 Nov 2020 16:35:12 +0800 Subject: [PATCH] Remove unused shader files [ci build] --- cocos/renderer/ccShaders.cpp | 2 - .../shaders/positionTextureUColor.frag | 40 ----------------- .../shaders/positionTextureUColor.vert | 44 ------------------- 3 files changed, 86 deletions(-) delete mode 100644 cocos/renderer/shaders/positionTextureUColor.frag delete mode 100644 cocos/renderer/shaders/positionTextureUColor.vert diff --git a/cocos/renderer/ccShaders.cpp b/cocos/renderer/ccShaders.cpp index b395253449..51ccad4a4a 100644 --- a/cocos/renderer/ccShaders.cpp +++ b/cocos/renderer/ccShaders.cpp @@ -48,8 +48,6 @@ NS_CC_BEGIN #include "renderer/shaders/position.vert" #include "renderer/shaders/layer_radialGradient.frag" #include "renderer/shaders/ui_Gray.frag" -#include "renderer/shaders/positionTextureUColor.vert" -#include "renderer/shaders/positionTextureUColor.frag" #include "renderer/shaders/positionUColor.vert" #include "renderer/shaders/positionUColor.frag" #include "renderer/shaders/etc1.frag" diff --git a/cocos/renderer/shaders/positionTextureUColor.frag b/cocos/renderer/shaders/positionTextureUColor.frag deleted file mode 100644 index f4ef3aa1a3..0000000000 --- a/cocos/renderer/shaders/positionTextureUColor.frag +++ /dev/null @@ -1,40 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -const char* positionTextureUColor_frag = R"( -#ifdef GL_ES -varying mediump vec2 v_texCoord; -#else -varying vec2 v_texCoord; -#endif - -uniform vec4 u_color; -uniform sampler2D u_texture; - -void main() -{ - gl_FragColor = u_color * texture2D(u_texture, v_texCoord); -} -)"; diff --git a/cocos/renderer/shaders/positionTextureUColor.vert b/cocos/renderer/shaders/positionTextureUColor.vert deleted file mode 100644 index 60f3228f6e..0000000000 --- a/cocos/renderer/shaders/positionTextureUColor.vert +++ /dev/null @@ -1,44 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -const char* positionTextureUColor_vert = R"( - -attribute vec4 a_position; -attribute vec2 a_texCoord; - -uniform mat4 u_MVPMatrix; - -#ifdef GL_ES -varying mediump vec2 v_texCoord; -#else -varying vec2 v_texCoord; -#endif - -void main() -{ - gl_Position = u_MVPMatrix * a_position; - v_texCoord = a_texCoord; -} -)";