Skip to content

Commit

Permalink
gfx_api: Clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
past-due committed Jul 15, 2023
1 parent cc7954f commit a6dbf64
Showing 1 changed file with 0 additions and 54 deletions.
54 changes: 0 additions & 54 deletions lib/ivis_opengl/gfx_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -652,60 +652,6 @@ namespace gfx_api
// NOTE: Be very careful changing these constant_buffer_type structs;
// they must match std140 layout rules (see: the Vulkan shaders)

template<>
struct constant_buffer_type<SHADER_COMPONENT>
{
glm::vec4 colour;
glm::vec4 teamcolour;
float shaderStretch;
int tcmask;
int fogEnabled;
int normalMap;
int specularMap;
int ecmState;
int alphaTest;
float timeState;
glm::mat4 ModelViewMatrix;
glm::mat4 ModelViewProjectionMatrix;
glm::mat4 NormalMatrix;
glm::vec4 sunPos;
glm::vec4 sceneColor;
glm::vec4 ambient;
glm::vec4 diffuse;
glm::vec4 specular;
glm::vec4 fogColour;
float fogEnd;
float fogBegin;
int hasTangents;
};

template<>
struct constant_buffer_type<SHADER_NOLIGHT>
{
glm::vec4 colour;
glm::vec4 teamcolour;
float shaderStretch;
int tcmask;
int fogEnabled;
int normalMap;
int specularMap;
int ecmState;
int alphaTest;
float timeState;
glm::mat4 ModelViewMatrix;
glm::mat4 ModelViewProjectionMatrix;
glm::mat4 NormalMatrix;
glm::vec4 sunPos;
glm::vec4 sceneColor;
glm::vec4 ambient;
glm::vec4 diffuse;
glm::vec4 specular;
glm::vec4 fogColour;
float fogEnd;
float fogBegin;
int hasTangents;
};

// Only change once per frame
struct Draw3DShapeGlobalUniforms
{
Expand Down

0 comments on commit a6dbf64

Please sign in to comment.