mirror of https://github.com/snes9xgit/snes9x.git
Fix some compiler warnings.
This commit is contained in:
parent
96a5e03770
commit
7c39cc34ba
|
@ -469,7 +469,7 @@ JoyDevice::~JoyDevice (void)
|
|||
}
|
||||
|
||||
void
|
||||
JoyDevice::add_event (int parameter, int state)
|
||||
JoyDevice::add_event (unsigned int parameter, unsigned int state)
|
||||
{
|
||||
JoyEvent event = { parameter, state };
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ class JoyDevice
|
|||
|
||||
private:
|
||||
void poll_events (void);
|
||||
void add_event (int parameter, int state);
|
||||
void add_event (unsigned int parameter, unsigned int state);
|
||||
|
||||
};
|
||||
#endif
|
||||
|
|
|
@ -718,6 +718,7 @@ S9xMergeHires (void *buffer,
|
|||
return;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void
|
||||
S9xBlendHires (void *buffer, int pitch, int &width, int &height)
|
||||
{
|
||||
|
@ -751,6 +752,7 @@ S9xBlendHires (void *buffer, int pitch, int &width, int &height)
|
|||
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
filter_2x (void *src,
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
class S9xDisplayDriver
|
||||
{
|
||||
public:
|
||||
virtual ~S9xDisplayDriver() {}
|
||||
virtual void refresh (int width, int height) = 0;
|
||||
virtual int init (void) = 0;
|
||||
virtual void deinit (void) = 0;
|
||||
|
|
|
@ -318,16 +318,22 @@ S9xOpenGLDisplayDriver::update (int width, int height)
|
|||
if (using_shaders)
|
||||
{
|
||||
GLint location;
|
||||
float inputSize[2];
|
||||
float outputSize[2];
|
||||
float textureSize[2];
|
||||
|
||||
float inputSize[2] = { width, height };
|
||||
inputSize[0] = width;
|
||||
inputSize[1] = height;
|
||||
location = glGetUniformLocation (program, "rubyInputSize");
|
||||
glUniform2fv (location, 1, inputSize);
|
||||
|
||||
float outputSize[2] = {w , h };
|
||||
outputSize[0] = w;
|
||||
outputSize[1] = h;
|
||||
location = glGetUniformLocation (program, "rubyOutputSize");
|
||||
glUniform2fv (location, 1, outputSize);
|
||||
|
||||
float textureSize[2] = { texture_width, texture_height };
|
||||
textureSize[0] = texture_width;
|
||||
textureSize[1] = texture_height;
|
||||
location = glGetUniformLocation (program, "rubyTextureSize");
|
||||
glUniform2fv (location, 1, textureSize);
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
class S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
virtual ~S9xSoundDriver () {}
|
||||
virtual void init (void) = 0;
|
||||
virtual void terminate (void) = 0;
|
||||
virtual bool8 open_device (void) = 0;
|
||||
|
|
Loading…
Reference in New Issue