Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of some more warnings

Browse Source
This commit is contained in:
OV2 2019-02-23 15:00:57 +01:00
parent 80956bd53d
commit 51e7da6751
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro/libretro.cpp
View File

@ -654,11 +654,11 @@ float get_aspect_ratio(unsigned width, unsigned height)
} }
// OV2: not sure if these really make sense - NTSC is similar to 4:3, PAL looks weird // OV2: not sure if these really make sense - NTSC is similar to 4:3, PAL looks weird
float sample_frequency_ntsc = 135000000.0f / 11.0f; double sample_frequency_ntsc = 135000000.0f / 11.0f;
float sample_frequency_pal = 14750000.0; double sample_frequency_pal = 14750000.0;
float sample_freq = retro_get_region() == RETRO_REGION_NTSC ? sample_frequency_ntsc : sample_frequency_pal; double sample_freq = retro_get_region() == RETRO_REGION_NTSC ? sample_frequency_ntsc : sample_frequency_pal;
float dot_rate = SNES::cpu.frequency / 4.0; double dot_rate = SNES::cpu.frequency / 4.0;
if (aspect_ratio_mode == ASPECT_RATIO_NTSC) // ntsc if (aspect_ratio_mode == ASPECT_RATIO_NTSC) // ntsc
{ {
@ -671,8 +671,8 @@ float get_aspect_ratio(unsigned width, unsigned height)
dot_rate = PAL_MASTER_CLOCK / 4.0; dot_rate = PAL_MASTER_CLOCK / 4.0;
} }
float par = sample_freq / 2.0 / dot_rate; double par = sample_freq / 2.0 / dot_rate;
return (float)width * par / (float)height; return (float)(width * par / height);
} }
void retro_get_system_av_info(struct retro_system_av_info *info) void retro_get_system_av_info(struct retro_system_av_info *info)

20
shaders/glsl.cpp
View File

@ -713,37 +713,37 @@ void GLSLShader::render(GLuint &orig,
switch (pass[i].scale_type_x) switch (pass[i].scale_type_x)
{ {
case GLSL_ABSOLUTE: case GLSL_ABSOLUTE:
pass[i].width = pass[i].scale_x; pass[i].width = (GLuint)pass[i].scale_x;
break; break;
case GLSL_SOURCE: case GLSL_SOURCE:
pass[i].width = pass[i-1].width * pass[i].scale_x; pass[i].width = (GLuint)(pass[i-1].width * pass[i].scale_x);
break; break;
case GLSL_VIEWPORT: case GLSL_VIEWPORT:
pass[i].width = viewport_width * pass[i].scale_x; pass[i].width = (GLuint)(viewport_width * pass[i].scale_x);
break; break;
default: default:
if (lastpass) if (lastpass)
pass[i].width = viewport_width; pass[i].width = viewport_width;
else else
pass[i].width = pass[i - 1].width * pass[i].scale_x; pass[i].width = (GLuint)(pass[i - 1].width * pass[i].scale_x);
} }
switch (pass[i].scale_type_y) switch (pass[i].scale_type_y)
{ {
case GLSL_ABSOLUTE: case GLSL_ABSOLUTE:
pass[i].height = pass[i].scale_y; pass[i].height = (GLuint)pass[i].scale_y;
break; break;
case GLSL_SOURCE: case GLSL_SOURCE:
pass[i].height = pass[i - 1].height * pass[i].scale_y; pass[i].height = (GLuint)(pass[i - 1].height * pass[i].scale_y);
break; break;
case GLSL_VIEWPORT: case GLSL_VIEWPORT:
pass[i].height = viewport_height * pass[i].scale_y; pass[i].height = (GLuint)(viewport_height * pass[i].scale_y);
break; break;
default: default:
if (lastpass) if (lastpass)
pass[i].height = viewport_height; pass[i].height = viewport_height;
else else
pass[i].height = pass[i - 1].height * pass[i].scale_y; pass[i].height = (GLuint)(pass[i - 1].height * pass[i].scale_y);
} }
bool direct_lastpass = true; bool direct_lastpass = true;
@ -1073,8 +1073,8 @@ void GLSLShader::set_shader_vars(unsigned int p, bool inverted)
unsigned int shaderFrameCnt = frame_count; unsigned int shaderFrameCnt = frame_count;
if (pass[p].frame_count_mod) if (pass[p].frame_count_mod)
shaderFrameCnt %= pass[p].frame_count_mod; shaderFrameCnt %= pass[p].frame_count_mod;
setUniform1i(u->FrameCount, (float)shaderFrameCnt); setUniform1i(u->FrameCount, shaderFrameCnt);
setUniform1i(u->FrameDirection, Settings.Rewinding ? -1.0f : 1.0f); setUniform1i(u->FrameDirection, Settings.Rewinding ? -1 : 1);
setTexCoords(u->TexCoord); setTexCoords(u->TexCoord);
setTexCoords(u->LUTTexCoord); setTexCoords(u->LUTTexCoord);

2
spc7110dec.cpp
View File

@ -466,7 +466,7 @@ const uint8 SPC7110Decomp::mode2_context_table[32][2] = {
uint8 SPC7110Decomp::probability (unsigned n) { return evolution_table[context[n].index][0]; } uint8 SPC7110Decomp::probability (unsigned n) { return evolution_table[context[n].index][0]; }
uint8 SPC7110Decomp::next_lps (unsigned n) { return evolution_table[context[n].index][1]; } uint8 SPC7110Decomp::next_lps (unsigned n) { return evolution_table[context[n].index][1]; }
uint8 SPC7110Decomp::next_mps (unsigned n) { return evolution_table[context[n].index][2]; } uint8 SPC7110Decomp::next_mps (unsigned n) { return evolution_table[context[n].index][2]; }
bool SPC7110Decomp::toggle_invert(unsigned n) { return evolution_table[context[n].index][3]; } uint8 SPC7110Decomp::toggle_invert(unsigned n) { return evolution_table[context[n].index][3]; }
unsigned SPC7110Decomp::morton_2x8(unsigned data) { unsigned SPC7110Decomp::morton_2x8(unsigned data) {
//reverse morton lookup: de-interleave two 8-bit values //reverse morton lookup: de-interleave two 8-bit values

2
spc7110dec.h
View File

@ -56,7 +56,7 @@ public:
uint8 probability(unsigned n); uint8 probability(unsigned n);
uint8 next_lps(unsigned n); uint8 next_lps(unsigned n);
uint8 next_mps(unsigned n); uint8 next_mps(unsigned n);
bool toggle_invert(unsigned n); uint8 toggle_invert(unsigned n);
unsigned morton16[2][256]; unsigned morton16[2][256];
unsigned morton32[4][256]; unsigned morton32[4][256];