reset back to good old standards. ;p

This commit is contained in:
Themaister 2010-11-13 03:31:37 +01:00
parent 42dc761cac
commit ccc73ccbdb
3 changed files with 10 additions and 4 deletions

View File

@ -62,15 +62,15 @@ static const unsigned fullscreen_y = 720;
static const bool vsync = true;
// Smooths picture
static const bool video_smooth = false;
static const bool video_smooth = true;
// Path to custom Cg shader. If using custom shaders, it is recommended to disable video_smooth and VIDEO_FILTER.
// Path to custom Cg shader. If using custom shaders, it is recommended to disable video_smooth.
static const char *cg_shader_path = "hqflt/crt.cg";
// On resize and fullscreen, rendering area will stay 4:3
static const bool force_aspect = true;
/////////// Video filters
/////////// Video filters (CPU based)
#define FILTER_NONE 0
#define FILTER_HQ2X 1
#define FILTER_HQ4X 2

View File

@ -1,6 +1,6 @@
BUILD_OPENGL = 1
BUILD_CG = 1
BUILD_CG = 0
BUILD_FILTER = 0
BUILD_RSOUND = 0

6
gl.c
View File

@ -45,7 +45,9 @@ static const GLfloat tex_coords[] = {
};
static bool keep_aspect = true;
#ifdef HAVE_CG
static CGparameter cg_mvp_matrix;
#endif
typedef struct gl
{
bool vsync;
@ -189,7 +191,9 @@ static void GLFWCALL resize(int width, int height)
glOrtho(0, 1, 0, 1, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
#ifdef HAVE_CG
cgGLSetStateMatrixParameter(cg_mvp_matrix, CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
#endif
}
static float tv_to_fps(const struct timeval *tv, const struct timeval *new_tv, int frames)
@ -368,9 +372,11 @@ static void* gl_init(video_info_t *video, const input_driver_t **input)
*input = &input_glfw;
return gl;
#ifdef HAVE_CG
error:
free(gl);
return NULL;
#endif
}
const video_driver_t video_gl = {