Parcourir la source

Merge pull request #382 from nounoursheureux/develop

Have SetShaderValue(i) take a const pointer
pull/384/head
Ray il y a 7 ans
committed by GitHub
Parent
révision
2eceecb7b7
Aucune clé connue n'a été trouvée dans la base pour cette signature ID de la clé GPG: 4AEE18F83AFDEB23
2 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. +2
    -2
      src/raylib.h
  2. +2
    -2
      src/rlgl.c

+ 2
- 2
src/raylib.h Voir le fichier

@ -1075,8 +1075,8 @@ RLAPI Texture2D GetTextureDefault(void); // Get
// Shader configuration functions
RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location
RLAPI void SetShaderValue(Shader shader, int uniformLoc, float *value, int size); // Set shader uniform value (float)
RLAPI void SetShaderValuei(Shader shader, int uniformLoc, int *value, int size); // Set shader uniform value (int)
RLAPI void SetShaderValue(Shader shader, int uniformLoc, ">const float *value, int size); // Set shader uniform value (float)
RLAPI void SetShaderValuei(Shader shader, int uniformLoc, ">const int *value, int size); // Set shader uniform value (int)
RLAPI void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat); // Set shader uniform value (matrix 4x4)
RLAPI void SetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix)
RLAPI void SetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix)

+ 2
- 2
src/rlgl.c Voir le fichier

@ -2452,7 +2452,7 @@ int GetShaderLocation(Shader shader, const char *uniformName)
}
// Set shader uniform value (float)
void SetShaderValue(Shader shader, int uniformLoc, float *value, int size)
void SetShaderValue(Shader shader, int uniformLoc, ">const float *value, int size)
{
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
glUseProgram(shader.id);
@ -2468,7 +2468,7 @@ void SetShaderValue(Shader shader, int uniformLoc, float *value, int size)
}
// Set shader uniform value (int)
void SetShaderValuei(Shader shader, int uniformLoc, int *value, int size)
void SetShaderValuei(Shader shader, int uniformLoc, ">const int *value, int size)
{
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
glUseProgram(shader.id);

Chargement…
Annuler
Enregistrer