sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* GLSL spec allows having unset uniforms/attributes/varyings as long as they are not used in the shader, thus they are now always in scope

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9622 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-08-05 21:59:58 +00:00
parent dba5ba5851
commit 0a38ca0cf4
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag
View File

@ -1,27 +1,15 @@
uniform vec4 m_Color;
#if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD)) #if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD))
#define NEED_TEXCOORD1 #define NEED_TEXCOORD1
#endif #endif
#ifdef HAS_COLORMAP uniform vec4 m_Color;
uniform sampler2D m_ColorMap; uniform sampler2D m_ColorMap;
#endif uniform sampler2D m_LightMap;
#ifdef NEED_TEXCOORD1 varying vec2 texCoord1;
varying vec2 texCoord1; varying vec2 texCoord2;
#endif
#ifdef HAS_LIGHTMAP varying vec4 vertColor;
uniform sampler2D m_LightMap;
#ifdef SEPARATE_TEXCOORD
varying vec2 texCoord2;
#endif
#endif
#ifdef HAS_VERTEXCOLOR
varying vec4 vertColor;
#endif
void main(){ void main(){
vec4 color = vec4(1.0); vec4 color = vec4(1.0);

18
engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert
View File

@ -5,20 +5,14 @@ attribute vec3 inPosition;
#define NEED_TEXCOORD1 #define NEED_TEXCOORD1
#endif #endif
#ifdef NEED_TEXCOORD1 attribute vec2 inTexCoord;
attribute vec2 inTexCoord; attribute vec2 inTexCoord2;
varying vec2 texCoord1; attribute vec4 inColor;
#endif
#ifdef SEPARATE_TEXCOORD varying vec2 texCoord1;
attribute vec2 inTexCoord2; varying vec2 texCoord2;
varying vec2 texCoord2;
#endif
#ifdef HAS_VERTEXCOLOR varying vec4 vertColor;
attribute vec4 inColor;
varying vec4 vertColor;
#endif
void main(){ void main(){
#ifdef NEED_TEXCOORD1 #ifdef NEED_TEXCOORD1