Skip to content

Commit 2a2acff

Browse files
RicoPgithub-actions[bot]raysan5
authored
Make sure ShaderUniformDataType matches rlShaderUniformDataType (#4577)
* Make sure ShaderUniformDataType matches rlShaderUniformDataType * Update raylib_api.* by CI --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Ray <raysan5@gmail.com>
1 parent 732da94 commit 2a2acff

5 files changed

Lines changed: 58 additions & 7 deletions

File tree

parser/output/raylib_api.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,8 +2596,28 @@
25962596
"description": "Shader uniform type: ivec4 (4 int)"
25972597
},
25982598
{
2599-
"name": "SHADER_UNIFORM_SAMPLER2D",
2599+
"name": "SHADER_UNIFORM_UINT",
26002600
"value": 8,
2601+
"description": "Shader uniform type: unsigned int"
2602+
},
2603+
{
2604+
"name": "SHADER_UNIFORM_UIVEC2",
2605+
"value": 9,
2606+
"description": "Shader uniform type: uivec2 (2 unsigned int)"
2607+
},
2608+
{
2609+
"name": "SHADER_UNIFORM_UIVEC3",
2610+
"value": 10,
2611+
"description": "Shader uniform type: uivec3 (3 unsigned int)"
2612+
},
2613+
{
2614+
"name": "SHADER_UNIFORM_UIVEC4",
2615+
"value": 11,
2616+
"description": "Shader uniform type: uivec4 (4 unsigned int)"
2617+
},
2618+
{
2619+
"name": "SHADER_UNIFORM_SAMPLER2D",
2620+
"value": 12,
26012621
"description": "Shader uniform type: sampler2d"
26022622
}
26032623
]

parser/output/raylib_api.lua

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,8 +2596,28 @@ return {
25962596
description = "Shader uniform type: ivec4 (4 int)"
25972597
},
25982598
{
2599-
name = "SHADER_UNIFORM_SAMPLER2D",
2599+
name = "SHADER_UNIFORM_UINT",
26002600
value = 8,
2601+
description = "Shader uniform type: unsigned int"
2602+
},
2603+
{
2604+
name = "SHADER_UNIFORM_UIVEC2",
2605+
value = 9,
2606+
description = "Shader uniform type: uivec2 (2 unsigned int)"
2607+
},
2608+
{
2609+
name = "SHADER_UNIFORM_UIVEC3",
2610+
value = 10,
2611+
description = "Shader uniform type: uivec3 (3 unsigned int)"
2612+
},
2613+
{
2614+
name = "SHADER_UNIFORM_UIVEC4",
2615+
value = 11,
2616+
description = "Shader uniform type: uivec4 (4 unsigned int)"
2617+
},
2618+
{
2619+
name = "SHADER_UNIFORM_SAMPLER2D",
2620+
value = 12,
26012621
description = "Shader uniform type: sampler2d"
26022622
}
26032623
}

parser/output/raylib_api.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,7 @@ Enum 09: ShaderLocationIndex (30 values)
827827
Value[SHADER_LOC_VERTEX_BONEIDS]: 26
828828
Value[SHADER_LOC_VERTEX_BONEWEIGHTS]: 27
829829
Value[SHADER_LOC_BONE_MATRICES]: 28
830-
Value[SHADER_LOC_VERTEX_INSTANCE_TX]: 29
831-
Enum 10: ShaderUniformDataType (9 values)
830+
Enum 10: ShaderUniformDataType (13 values)
832831
Name: ShaderUniformDataType
833832
Description: Shader uniform data type
834833
Value[SHADER_UNIFORM_FLOAT]: 0
@@ -839,7 +838,11 @@ Enum 10: ShaderUniformDataType (9 values)
839838
Value[SHADER_UNIFORM_IVEC2]: 5
840839
Value[SHADER_UNIFORM_IVEC3]: 6
841840
Value[SHADER_UNIFORM_IVEC4]: 7
842-
Value[SHADER_UNIFORM_SAMPLER2D]: 8
841+
Value[SHADER_UNIFORM_UINT]: 8
842+
Value[SHADER_UNIFORM_UIVEC2]: 9
843+
Value[SHADER_UNIFORM_UIVEC3]: 10
844+
Value[SHADER_UNIFORM_UIVEC4]: 11
845+
Value[SHADER_UNIFORM_SAMPLER2D]: 12
843846
Enum 11: ShaderAttributeDataType (4 values)
844847
Name: ShaderAttributeDataType
845848
Description: Shader attribute data types

parser/output/raylib_api.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@
539539
<Value name="SHADER_LOC_BONE_MATRICES" integer="28" desc="Shader location: array of matrices uniform: boneMatrices" />
540540
<Value name="SHADER_LOC_VERTEX_INSTANCE_TX" integer="29" desc="Shader location: vertex attribute: instanceTransform" />
541541
</Enum>
542-
<Enum name="ShaderUniformDataType" valueCount="9" desc="Shader uniform data type">
542+
<Enum name="ShaderUniformDataType" valueCount="13" desc="Shader uniform data type">
543543
<Value name="SHADER_UNIFORM_FLOAT" integer="0" desc="Shader uniform type: float" />
544544
<Value name="SHADER_UNIFORM_VEC2" integer="1" desc="Shader uniform type: vec2 (2 float)" />
545545
<Value name="SHADER_UNIFORM_VEC3" integer="2" desc="Shader uniform type: vec3 (3 float)" />
@@ -548,7 +548,11 @@
548548
<Value name="SHADER_UNIFORM_IVEC2" integer="5" desc="Shader uniform type: ivec2 (2 int)" />
549549
<Value name="SHADER_UNIFORM_IVEC3" integer="6" desc="Shader uniform type: ivec3 (3 int)" />
550550
<Value name="SHADER_UNIFORM_IVEC4" integer="7" desc="Shader uniform type: ivec4 (4 int)" />
551-
<Value name="SHADER_UNIFORM_SAMPLER2D" integer="8" desc="Shader uniform type: sampler2d" />
551+
<Value name="SHADER_UNIFORM_UINT" integer="8" desc="Shader uniform type: unsigned int" />
552+
<Value name="SHADER_UNIFORM_UIVEC2" integer="9" desc="Shader uniform type: uivec2 (2 unsigned int)" />
553+
<Value name="SHADER_UNIFORM_UIVEC3" integer="10" desc="Shader uniform type: uivec3 (3 unsigned int)" />
554+
<Value name="SHADER_UNIFORM_UIVEC4" integer="11" desc="Shader uniform type: uivec4 (4 unsigned int)" />
555+
<Value name="SHADER_UNIFORM_SAMPLER2D" integer="12" desc="Shader uniform type: sampler2d" />
552556
</Enum>
553557
<Enum name="ShaderAttributeDataType" valueCount="4" desc="Shader attribute data types">
554558
<Value name="SHADER_ATTRIB_FLOAT" integer="0" desc="Shader attribute type: float" />

src/raylib.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,10 @@ typedef enum {
818818
SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int)
819819
SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int)
820820
SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int)
821+
SHADER_UNIFORM_UINT, // Shader uniform type: unsigned int
822+
SHADER_UNIFORM_UIVEC2, // Shader uniform type: uivec2 (2 unsigned int)
823+
SHADER_UNIFORM_UIVEC3, // Shader uniform type: uivec3 (3 unsigned int)
824+
SHADER_UNIFORM_UIVEC4, // Shader uniform type: uivec4 (4 unsigned int)
821825
SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d
822826
} ShaderUniformDataType;
823827

0 commit comments

Comments
 (0)