summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Kaminski <kamilkss@gmail.com>2011-08-21 21:19:42 -0500
committerKamil Kaminski <kamilkss@gmail.com>2011-08-21 21:19:42 -0500
commitcd43cae2c7bcf4335baaeefdf36de95e2059d0ff (patch)
treef0b172303cdb96e78d2ae8974601d69ad22e1efe
parent157f167983a734c59e2e512905f654c44ced68a7 (diff)
downloadglshader2.1-cd43cae2c7bcf4335baaeefdf36de95e2059d0ff.tar.gz
glshader2.1-cd43cae2c7bcf4335baaeefdf36de95e2059d0ff.tar.bz2
glshader2.1-cd43cae2c7bcf4335baaeefdf36de95e2059d0ff.zip
up the resolution to 640x480HEADmaster
-rw-r--r--shader.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shader.c b/shader.c
index 60b9a11..9b7d354 100644
--- a/shader.c
+++ b/shader.c
@@ -111,7 +111,7 @@ static size_t loadfile_to_mem(char *fname, char **memory)
fseek(file, 0, SEEK_END);
size_t end = ftell(file);
fseek(file, 0, SEEK_SET);
-
+
*memory = (char *) malloc(sizeof(char) * end);
if (!memory)
{
@@ -418,7 +418,7 @@ static void setup_sdl(void)
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
- if ((screen = SDL_SetVideoMode(320, 240, 32, SDL_OPENGL | SDL_RESIZABLE)) == NULL)
+ if ((screen = SDL_SetVideoMode(640, 480, 32, SDL_OPENGL | SDL_RESIZABLE)) == NULL)
{
fprintf(stderr, "SDL: unable to set video mode: %s\n", SDL_GetError());
exit(-1);
@@ -429,8 +429,8 @@ static void setup_sdl(void)
* for OpenGL, we do this ourselves */
SDL_Event resizeEvent;
resizeEvent.type = SDL_VIDEORESIZE;
- resizeEvent.resize.w = 320;
- resizeEvent.resize.h = 240;
+ resizeEvent.resize.w = 640;
+ resizeEvent.resize.h = 480;
SDL_PushEvent(&resizeEvent);
}