MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fight the merge.. fight it.

Browse Source
This commit is contained in:
Jeffery Myers 2021-06-15 12:34:04 -07:00
parent 5bd6c59f2a
commit b6d90224b0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raylib.h
View File

@ -775,7 +775,7 @@ typedef enum {
SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int)
SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int) SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int)
SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int) SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int)
SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d SHADER_UNIFORM_SAMPLER2D, // Shader uniform type: sampler2d
SHADER_UNIFORM_MAT3, // Shader uniform type: mat3 (9 float) SHADER_UNIFORM_MAT3, // Shader uniform type: mat3 (9 float)
SHADER_UNIFORM_MAT4 // Shader uniform type: mat4 (16 float) SHADER_UNIFORM_MAT4 // Shader uniform type: mat4 (16 float)
} ShaderUniformDataType; } ShaderUniformDataType;

4
src/rlgl.h
View File

@ -432,7 +432,9 @@ typedef struct RenderBatch {
SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int)
SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int) SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int)
SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int) SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int)
SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d SHADER_UNIFORM_SAMPLER2D, // Shader uniform type: sampler2d
SHADER_UNIFORM_MAT3, // Shader uniform type: mat3 (9 float)
SHADER_UNIFORM_MAT4 // Shader uniform type: mat4 (16 float)
} ShaderUniformDataType; } ShaderUniformDataType;
// Shader attribute data types // Shader attribute data types