summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRay <[email protected]>2024-05-01 18:41:28 +0200
committerRay <[email protected]>2024-05-01 18:41:28 +0200
commit33b32ca53a7817a9cfdb1840a8ab75fa7cb47723 (patch)
tree5af44d366369bda1cb47c1a1e9cd9a7e2f962011
parentc21edadab0e24d9340508329b454abe05227cdec (diff)
downloadraylib-33b32ca53a7817a9cfdb1840a8ab75fa7cb47723.tar.gz
raylib-33b32ca53a7817a9cfdb1840a8ab75fa7cb47723.zip
Default shader attrib locations need to be exposed
They need to be exposed on `rlgl.h` header section (not implementation section) because with some specific use cases (custom config.h, rmodels module enabled), building fails otherwise.
-rw-r--r--src/rlgl.h40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/rlgl.h b/src/rlgl.h
index 9477558c..ae53b4ef 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -322,6 +322,26 @@
#define RL_READ_FRAMEBUFFER 0x8CA8 // GL_READ_FRAMEBUFFER
#define RL_DRAW_FRAMEBUFFER 0x8CA9 // GL_DRAW_FRAMEBUFFER
+// Default shader vertex attribute locations
+#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION
+ #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION 0
+#endif
+#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD
+ #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD 1
+#endif
+#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL
+ #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL 2
+#endif
+#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR
+ #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR 3
+#endif
+ #ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT
+#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT 4
+#endif
+#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2
+ #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2 5
+#endif
+
//----------------------------------------------------------------------------------
// Types and Structures Definition
//----------------------------------------------------------------------------------
@@ -934,26 +954,6 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
#endif
#endif
-// Default shader vertex attribute locations
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION 0
-#endif
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD 1
-#endif
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL 2
-#endif
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR 3
-#endif
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT 4
-#endif
-#ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2
- #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2 5
-#endif
-
// Default shader vertex attribute names to set location points
#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION
#define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION