CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 07:16:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slight cleanup.

Browse Source
This commit is contained in:
Themaister 2011-05-28 15:06:46 +02:00
parent 3213bb13ea
commit 200d2b598b
2 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gfx/shader_cg.c
View File

@ -385,7 +385,7 @@ static bool load_imports(config_file_t *conf)
struct snes_tracker_uniform_info info[MAX_VARIABLES];
unsigned info_cnt = 0;
char *id = strtok(imports, ";");
const char *id = strtok(imports, ";");
while (id && info_cnt < MAX_VARIABLES)
{
char semantic_buf[64];
@ -446,40 +446,34 @@ static bool load_imports(config_file_t *conf)
goto error;
}
int memtype = 0;
switch (ram_type)
{
case SSNES_STATE_WRAM:
if (addr >= 128 * 1024)
{
SSNES_ERR("Address out of range.\n");
goto error;
}
memtype = SNES_MEMORY_WRAM;
break;
case SSNES_STATE_APURAM:
memtype = SNES_MEMORY_APURAM;
break;
case SSNES_STATE_VRAM:
if (addr >= 64 * 1024)
{
SSNES_ERR("Address out of range.\n");
goto error;
}
memtype = SNES_MEMORY_VRAM;
break;
case SSNES_STATE_OAM:
if (addr >= 512 + 32)
{
SSNES_ERR("Address out of range.\n");
goto error;
}
memtype = SNES_MEMORY_OAM;
break;
case SSNES_STATE_CGRAM:
if (addr >= 512)
{
SSNES_ERR("Address out of range.\n");
goto error;
}
memtype = SNES_MEMORY_CGRAM;
break;
default:
break;
}
if (addr >= psnes_get_memory_size(memtype))
{
SSNES_ERR("Address out of bounds.\n");
goto error;
}
strlcpy(info[info_cnt].id, id, sizeof(info[info_cnt].id));
info[info_cnt].addr = addr;
info[info_cnt].type = tracker_type;

27
gfx/shader_glsl.c
View File

@ -415,33 +415,34 @@ static bool get_import_value(xmlNodePtr ptr)
goto error;
}
int memtype = 0;
switch (ram_type)
{
case SSNES_STATE_WRAM:
if (addr >= psnes_get_memory_size(SNES_MEMORY_WRAM))
goto error;
break;
case SSNES_STATE_VRAM:
if (addr >= psnes_get_memory_size(SNES_MEMORY_VRAM))
goto error;
memtype = SNES_MEMORY_WRAM;
break;
case SSNES_STATE_APURAM:
if (addr >= psnes_get_memory_size(SNES_MEMORY_APURAM))
goto error;
memtype = SNES_MEMORY_APURAM;
break;
case SSNES_STATE_VRAM:
memtype = SNES_MEMORY_VRAM;
break;
case SSNES_STATE_OAM:
if (addr >= psnes_get_memory_size(SNES_MEMORY_OAM))
goto error;
memtype = SNES_MEMORY_OAM;
break;
case SSNES_STATE_CGRAM:
if (addr >= psnes_get_memory_size(SNES_MEMORY_CGRAM))
goto error;
memtype = SNES_MEMORY_CGRAM;
break;
default:
break;
}
if (addr >= psnes_get_memory_size(memtype))
{
SSNES_ERR("Address out of bounds.\n");
goto error;
}
if (strcmp((const char*)semantic, "capture") == 0)
tracker_type = SSNES_STATE_CAPTURE;
else if (strcmp((const char*)semantic, "capture_previous") == 0)