From b6d90224b0ca3d515f02d6aee25f8a92b76c376b Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Tue, 15 Jun 2021 12:34:04 -0700 Subject: [PATCH] fight the merge.. fight it. --- src/raylib.h | 2 +- src/rlgl.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 21ad3e03e..031c4f62e 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -775,7 +775,7 @@ typedef enum { SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 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; diff --git a/src/rlgl.h b/src/rlgl.h index 43d809bb2..a14c8bee4 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -432,7 +432,9 @@ typedef struct RenderBatch { SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 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; // Shader attribute data types