UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED: Some rlgl cleaning on unused types

Browse source
This commit is contained in:
Ray 2021-04-06 00:43:38 +02:00
parent a8dd4127f3
commit 802ca161d3
1 changed files with 4 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/rlgl.h
View file

@ -309,29 +309,15 @@ typedef enum {
unsigned char a; unsigned char a;
} Color; } Color;
// Rectangle type
typedef struct Rectangle {
float x;
float y;
float width;
float height;
} Rectangle;
// Texture type // Texture type
// NOTE: Data stored in GPU memory // NOTE: Data stored in GPU memory
typedef struct Texture { typedef struct Texture2D {
unsigned int id; // OpenGL texture id unsigned int id; // OpenGL texture id
int width; // Texture base width int width; // Texture base width
int height; // Texture base height int height; // Texture base height
int mipmaps; // Mipmap levels, 1 by default int mipmaps; // Mipmap levels, 1 by default
int format; // Data format (PixelFormat) int format; // Data format (PixelFormat)
} Texture; } Texture2D;
// Texture2D type, same as Texture
typedef Texture Texture2D;
// TextureCubemap type, actually, same as Texture
typedef Texture TextureCubemap;
// Shader type (generic) // Shader type (generic)
typedef struct Shader { typedef struct Shader {
@ -451,24 +437,6 @@ typedef enum {
SHADER_UNIFORM_IVEC4, SHADER_UNIFORM_IVEC4,
SHADER_UNIFORM_SAMPLER2D SHADER_UNIFORM_SAMPLER2D
} ShaderUniformDataType; } ShaderUniformDataType;
// Material map type
typedef enum {
MATERIAL_MAP_ALBEDO = 0, // MATERIAL_MAP_DIFFUSE
MATERIAL_MAP_METALNESS = 1, // MATERIAL_MAP_SPECULAR
MATERIAL_MAP_NORMAL = 2,
MATERIAL_MAP_ROUGHNESS = 3,
MATERIAL_MAP_OCCLUSION,
MATERIAL_MAP_EMISSION,
MATERIAL_MAP_HEIGHT,
MATERIAL_MAP_CUBEMAP, // NOTE: Uses GL_TEXTURE_CUBE_MAP
MATERIAL_MAP_IRRADIANCE, // NOTE: Uses GL_TEXTURE_CUBE_MAP
MATERIAL_MAP_PREFILTER, // NOTE: Uses GL_TEXTURE_CUBE_MAP
MATERIAL_MAP_BRDG
} MaterialMapIndex;
#define MATERIAL_MAP_DIFFUSE MATERIAL_MAP_ALBEDO
#define MATERIAL_MAP_SPECULAR MATERIAL_MAP_METALNESS
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
@ -906,7 +874,7 @@ static void rlUnloadShaderDefault(void); // Unload default shader (RLGL.State
#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2
#if defined(GRAPHICS_API_OPENGL_11) #if defined(GRAPHICS_API_OPENGL_11)
static int rlGenerateMipmapsData(unsigned char *data, int baseWidth, int baseHeight); // Generate mipmaps data on CPU side static int rlGenerateMipmapsData(unsigned char *data, int baseWidth, int baseHeight); // Generate mipmaps data on CPU side
static Color *rlGenNextMipmapData(Color *srcData, int srcWidth, int srcHeight); // Geenrate next mipmap level on CPU side static Color *rlGenNextMipmapData(Color *srcData, int srcWidth, int srcHeight); // Generate next mipmap level on CPU side
#endif #endif
static int rlGetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes (image or texture) static int rlGetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes (image or texture)
@ -3938,7 +3906,7 @@ static Color *rlGenNextMipmapData(Color *srcData, int srcWidth, int srcHeight)
return mipmap; return mipmap;
} }
#endif #endif // GRAPHICS_API_OPENGL_11
// Get pixel data size in bytes (image or texture) // Get pixel data size in bytes (image or texture)
// NOTE: Size depends on pixel format // NOTE: Size depends on pixel format