Get rid of hashes in shader_gl_cg

This commit is contained in:
twinaphex 2018-02-25 01:13:34 +01:00
parent 016e24e5a5
commit 938f6cc26e

View File

@ -27,7 +27,6 @@
#include <file/config_file.h> #include <file/config_file.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_assert.h> #include <retro_assert.h>
#include <rhash.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -51,13 +50,6 @@
#include "../../core.h" #include "../../core.h"
#include "../../managers/state_manager.h" #include "../../managers/state_manager.h"
#define SEMANTIC_TEXCOORD 0x92ee91cdU
#define SEMANTIC_TEXCOORD0 0xf0c0cb9dU
#define SEMANTIC_TEXCOORD1 0xf0c0cb9eU
#define SEMANTIC_COLOR 0x0ce809a4U
#define SEMANTIC_COLOR0 0xa9e93e54U
#define SEMANTIC_POSITION 0xd87309baU
#define PREV_TEXTURES (GFX_MAX_TEXTURES - 1) #define PREV_TEXTURES (GFX_MAX_TEXTURES - 1)
#define set_param_2f(param, x, y) if (param) cgGLSetParameter2f(param, x, y) #define set_param_2f(param, x, y) if (param) cgGLSetParameter2f(param, x, y)
@ -589,7 +581,6 @@ static void gl_cg_set_program_base_attrib(void *data, unsigned i)
for (; param; param = cgGetNextParameter(param)) for (; param; param = cgGetNextParameter(param))
{ {
uint32_t semantic_hash;
const char *semantic = NULL; const char *semantic = NULL;
if ( (cgGetParameterDirection(param) != CG_IN) if ( (cgGetParameterDirection(param) != CG_IN)
|| (cgGetParameterVariability(param) != CG_VARYING)) || (cgGetParameterVariability(param) != CG_VARYING))
@ -601,25 +592,20 @@ static void gl_cg_set_program_base_attrib(void *data, unsigned i)
RARCH_LOG("[CG]: Found semantic \"%s\" in prog #%u.\n", semantic, i); RARCH_LOG("[CG]: Found semantic \"%s\" in prog #%u.\n", semantic, i);
semantic_hash = djb2_calculate(semantic); if (
string_is_equal(semantic, "TEXCOORD") ||
switch (semantic_hash) string_is_equal(semantic, "TEXCOORD0")
{ )
case SEMANTIC_TEXCOORD: cg->prg[i].tex = param;
case SEMANTIC_TEXCOORD0: else if (
cg->prg[i].tex = param; string_is_equal(semantic, "COLOR") ||
break; string_is_equal(semantic, "COLOR0")
case SEMANTIC_COLOR: )
case SEMANTIC_COLOR0:
cg->prg[i].color = param; cg->prg[i].color = param;
break; else if (string_is_equal(semantic, "POSITION"))
case SEMANTIC_POSITION: cg->prg[i].vertex = param;
cg->prg[i].vertex = param; else if (string_is_equal(semantic, "TEXCOORD1"))
break; cg->prg[i].lut_tex = param;
case SEMANTIC_TEXCOORD1:
cg->prg[i].lut_tex = param;
break;
}
} }
if (!cg->prg[i].tex) if (!cg->prg[i].tex)