Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build warnings in wxWidgets GUI.

Browse source
This commit is contained in:
SarahW 2017-08-05 20:05:35 +01:00
commit ec6ba93665
9 changed files with 40 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/model.h
View file

@ -15,7 +15,7 @@ typedef struct
{ {
char name[8]; char name[8];
CPU *cpus; CPU *cpus;
} cpu[4]; } cpu[5];
int fixed_gfxcard; int fixed_gfxcard;
int flags; int flags;
int min_ram, max_ram; int min_ram, max_ram;

26
src/wx-config.c
View file

@ -23,7 +23,7 @@ static int romstolist[ROM_MAX], listtomodel[ROM_MAX], romstomodel[ROM_MAX],
modeltolist[ROM_MAX]; modeltolist[ROM_MAX];
static int settings_sound_to_list[20], settings_list_to_sound[20]; static int settings_sound_to_list[20], settings_list_to_sound[20];
static int settings_mouse_to_list[20], settings_list_to_mouse[20]; static int settings_mouse_to_list[20], settings_list_to_mouse[20];
static int settings_network_to_list[20], settings_list_to_network[20]; //static int settings_network_to_list[20], settings_list_to_network[20];
static char *hdd_names[16]; static char *hdd_names[16];
int has_been_inited = 0; int has_been_inited = 0;
@ -55,14 +55,14 @@ static int mouse_valid(int type, int model)
return 1; return 1;
} }
static int mpu401_available(int sound_card) /*static int mpu401_available(int sound_card)
{ {
char* name = sound_card_get_internal_name(sound_card); char* name = sound_card_get_internal_name(sound_card);
if (name && (!strcmp(name, "sb16") || !strcmp(name, "sbawe32"))) if (name && (!strcmp(name, "sb16") || !strcmp(name, "sbawe32")))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }*/
static void recalc_vid_list(void* hdlg, int model) static void recalc_vid_list(void* hdlg, int model)
{ {
@ -210,17 +210,14 @@ int config_dlgsave(void* hdlg)
{ {
char temp_str[256]; char temp_str[256];
void* h; void* h;
int c, d; int c;
int rom, gfx, fpu; int gfx, fpu;
int temp_cpu, temp_cpu_m, temp_model; int temp_cpu, temp_cpu_m, temp_model;
int temp_GAMEBLASTER, temp_GUS, temp_SSI2001, temp_voodoo, temp_sound_card_current; int temp_GAMEBLASTER, temp_GUS, temp_SSI2001, temp_voodoo, temp_sound_card_current;
int temp_dynarec; int temp_dynarec;
int cpu_flags;
int temp_fda_type, temp_fdb_type; int temp_fda_type, temp_fdb_type;
int temp_joystick_type;
int cpu_type;
int temp_mouse_type; int temp_mouse_type;
int hdd_changed; int hdd_changed = 0;
char s[260]; char s[260];
PcemHDC hd[4]; PcemHDC hd[4];
@ -412,16 +409,13 @@ int config_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
char temp_str[256]; char temp_str[256];
void* h; void* h;
int c, d; int c, d;
int rom, gfx, mem, fpu; int gfx, mem;
int temp_cpu, temp_cpu_m, temp_model; int temp_cpu, temp_cpu_m, temp_model;
int temp_GAMEBLASTER, temp_GUS, temp_SSI2001, temp_voodoo, temp_sound_card_current; int temp_sound_card_current;
int temp_dynarec; int temp_dynarec;
int cpu_flags; int cpu_flags;
int temp_fda_type, temp_fdb_type;
int temp_joystick_type;
int cpu_type; int cpu_type;
int temp_mouse_type; int temp_mouse_type;
int hdd_changed;
switch (message) switch (message)
{ {
@ -945,6 +939,7 @@ int config_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
return 0; return 0;
} }
} }
return 0;
} }
static struct static struct
@ -1094,7 +1089,6 @@ static int hdnew_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM l
int c; int c;
PcemHDC hd[4]; PcemHDC hd[4];
FILE *f; FILE *f;
uint8_t buf[512];
int hd_type; int hd_type;
switch (message) switch (message)
@ -1412,7 +1406,6 @@ int hdconf_init(void* hdlg)
int hdconf_update(void* hdlg) int hdconf_update(void* hdlg)
{ {
char s[260]; char s[260];
void* h;
int is_mfm = hdd_controller_selected_is_mfm(hdlg); int is_mfm = hdd_controller_selected_is_mfm(hdlg);
@ -1896,7 +1889,6 @@ int hdconf_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
int config_dialog_proc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam) int config_dialog_proc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
{ {
void* h;
switch (message) switch (message)
{ {
case WX_INITDIALOG: case WX_INITDIALOG:

2
src/wx-config_sel.c
View file

@ -10,7 +10,7 @@ extern int config_open(void* hwnd);
static void select_config(void* hdlg, char* name) static void select_config(void* hdlg, char* name)
{ {
char s[512]; char s[512];
int num, c, p; int num, c;
void* h; void* h;
h = wx_getdlgitem(hdlg, WX_ID("IDC_LIST")); h = wx_getdlgitem(hdlg, WX_ID("IDC_LIST"));

1
src/wx-deviceconfig.cc
View file

@ -173,7 +173,6 @@ int deviceconfig_dlgproc(void* hdlg, int message, INT_PARAM wParam,
{ {
device_config_selection_t *selection = config->selection; device_config_selection_t *selection = config->selection;
void* h = 0; void* h = 0;
int val_int;
switch (config->type) switch (config->type)
{ {

2
src/wx-glslp-parser.c
View file

@ -41,7 +41,7 @@ static char* load_file(const char* fn)
char* data = malloc(fsize+1); char* data = malloc(fsize+1);
long read = fread(data, fsize, 1, f); fread(data, fsize, 1, f);
fclose(f); fclose(f);
data[fsize] = 0; data[fsize] = 0;

61
src/wx-sdl2-video-gl3.c
View file

@ -299,7 +299,7 @@ static void create_texture(struct shader_texture* tex)
if (tex->height > max_texture_size) if (tex->height > max_texture_size)
tex->height = max_texture_size; tex->height = max_texture_size;
pclog("Create texture with size %dx%d\n", tex->width, tex->height); pclog("Create texture with size %dx%d\n", tex->width, tex->height);
glGenTextures(1, &tex->id); glGenTextures(1, (GLuint *)&tex->id);
glBindTexture(GL_TEXTURE_2D, tex->id); glBindTexture(GL_TEXTURE_2D, tex->id);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, tex->wrap_mode); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, tex->wrap_mode);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, tex->wrap_mode); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, tex->wrap_mode);
@ -314,7 +314,7 @@ static void create_texture(struct shader_texture* tex)
static void delete_texture(struct shader_texture* tex) static void delete_texture(struct shader_texture* tex)
{ {
if (tex->id > 0) if (tex->id > 0)
glDeleteTextures(1, &tex->id); glDeleteTextures(1, (GLuint *)&tex->id);
tex->id = 0; tex->id = 0;
} }
@ -322,7 +322,7 @@ static void delete_fbo(struct shader_fbo* fbo)
{ {
if (fbo->id >= 0) if (fbo->id >= 0)
{ {
glw->glDeleteFramebuffers(1, &fbo->id); glw->glDeleteFramebuffers(1, (GLuint *)&fbo->id);
delete_texture(&fbo->texture); delete_texture(&fbo->texture);
} }
} }
@ -336,9 +336,9 @@ static void delete_program(struct shader_program* program)
static void delete_vbo(struct shader_vbo* vbo) static void delete_vbo(struct shader_vbo* vbo)
{ {
if (vbo->color >= 0) glw->glDeleteBuffers(1, &vbo->color); if (vbo->color >= 0) glw->glDeleteBuffers(1, (GLuint *)&vbo->color);
glw->glDeleteBuffers(1, &vbo->vertex_coord); glw->glDeleteBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glDeleteBuffers(1, &vbo->tex_coord); glw->glDeleteBuffers(1, (GLuint *)&vbo->tex_coord);
} }
static void delete_pass(struct shader_pass* pass) static void delete_pass(struct shader_pass* pass)
@ -346,7 +346,7 @@ static void delete_pass(struct shader_pass* pass)
delete_fbo(&pass->fbo); delete_fbo(&pass->fbo);
delete_vbo(&pass->vbo); delete_vbo(&pass->vbo);
delete_program(&pass->program); delete_program(&pass->program);
glw->glDeleteVertexArrays(1, &pass->vertex_array); glw->glDeleteVertexArrays(1, (GLuint *)&pass->vertex_array);
} }
static void delete_prev(struct shader_prev* prev) static void delete_prev(struct shader_prev* prev)
@ -387,7 +387,7 @@ static void create_fbo(struct shader_fbo* fbo)
{ {
create_texture(&fbo->texture); create_texture(&fbo->texture);
glw->glGenFramebuffers(1, &fbo->id); glw->glGenFramebuffers(1, (GLuint *)&fbo->id);
glw->glBindFramebuffer(GL_FRAMEBUFFER, fbo->id); glw->glBindFramebuffer(GL_FRAMEBUFFER, fbo->id);
glw->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo->texture.id, 0); glw->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo->texture.id, 0);
@ -435,8 +435,8 @@ static void recreate_fbo(struct shader_fbo* fbo, int width, int height)
{ {
if (width != fbo->texture.width || height != fbo->texture.height) if (width != fbo->texture.width || height != fbo->texture.height)
{ {
glw->glDeleteFramebuffers(1, &fbo->id); glw->glDeleteFramebuffers(1, (GLuint *)&fbo->id);
glDeleteTextures(1, &fbo->texture.id); glDeleteTextures(1, (GLuint *)&fbo->texture.id);
fbo->texture.width = width; fbo->texture.width = width;
fbo->texture.height = height; fbo->texture.height = height;
create_fbo(fbo); create_fbo(fbo);
@ -450,7 +450,7 @@ static int create_default_shader_tex(struct shader_pass* pass)
!compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_tex_src, &pass->program.fragment_shader) || !compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_tex_src, &pass->program.fragment_shader) ||
!create_program(&pass->program)) !create_program(&pass->program))
return 0; return 0;
glw->glGenVertexArrays(1, &pass->vertex_array); glw->glGenVertexArrays(1, (GLuint *)&pass->vertex_array);
struct shader_uniforms* u = &pass->uniforms; struct shader_uniforms* u = &pass->uniforms;
int p = pass->program.id; int p = pass->program.id;
@ -472,7 +472,7 @@ static int create_default_shader_color(struct shader_pass* pass)
!compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_color_src, &pass->program.fragment_shader) || !compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_color_src, &pass->program.fragment_shader) ||
!create_program(&pass->program)) !create_program(&pass->program))
return 0; return 0;
glw->glGenVertexArrays(1, &pass->vertex_array); glw->glGenVertexArrays(1, (GLuint *)&pass->vertex_array);
struct shader_uniforms* u = &pass->uniforms; struct shader_uniforms* u = &pass->uniforms;
int p = pass->program.id; int p = pass->program.id;
@ -644,7 +644,7 @@ static glsl_t* load_glslp(glsl_t* glsl, int num_shader, const char* f)
} }
pass->frame_count_mod = shader->frame_count_mod; pass->frame_count_mod = shader->frame_count_mod;
glw->glGenVertexArrays(1, &pass->vertex_array); glw->glGenVertexArrays(1, (GLuint *)&pass->vertex_array);
find_uniforms(gshader, i); find_uniforms(gshader, i);
setup_scale(shader, pass); setup_scale(shader, pass);
if (i == p->num_shaders-1) /* last pass may or may not be an fbo depending on scale */ if (i == p->num_shaders-1) /* last pass may or may not be an fbo depending on scale */
@ -711,8 +711,6 @@ static glsl_t* load_shaders(int num, char shaders[MAX_USER_SHADERS][512])
const char* f = shaders[i]; const char* f = shaders[i];
if (f && strlen(f)) if (f && strlen(f))
{ {
struct glsl_shader* shader = &glsl->shaders[num-i-1];
if (!load_glslp(glsl, i, f)) if (!load_glslp(glsl, i, f))
{ {
failed = 1; failed = 1;
@ -800,9 +798,6 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
create_texture(&scene_texture); create_texture(&scene_texture);
GLint status;
char buffer[512];
/* load shader */ /* load shader */
// const char* shaders[1]; // const char* shaders[1];
// shaders[0] = gl3_shader_file; // shaders[0] = gl3_shader_file;
@ -868,12 +863,12 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
struct shader_vbo* vbo = &active_shader->scene.vbo; struct shader_vbo* vbo = &active_shader->scene.vbo;
glw->glGenBuffers(1, &vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(inv_vertex), inv_vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(inv_vertex), inv_vertex, GL_STATIC_DRAW);
glw->glVertexAttribPointer(active_shader->scene.uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(active_shader->scene.uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0);
glw->glGenBuffers(1, &vbo->tex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->tex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
glw->glVertexAttribPointer(active_shader->scene.uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(active_shader->scene.uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0);
@ -891,20 +886,20 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
struct shader_vbo* vbo = &shader->passes[i].vbo; struct shader_vbo* vbo = &shader->passes[i].vbo;
glw->glGenBuffers(1, &vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
glw->glVertexAttribPointer(u->vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(u->vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0);
glw->glGenBuffers(1, &vbo->tex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->tex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
glw->glVertexAttribPointer(u->tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(u->tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0);
if (u->color) if (u->color)
{ {
glw->glGenBuffers(1, &vbo->color); glw->glGenBuffers(1, (GLuint *)&vbo->color);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->color); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->color);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_STATIC_DRAW);
glw->glVertexAttribPointer(u->color, 4, GL_FLOAT, GL_FALSE, 4*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(u->color, 4, GL_FLOAT, GL_FALSE, 4*sizeof(GLfloat), (GLvoid*)0);
@ -924,12 +919,12 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
glw->glBindVertexArray(prev_pass->vertex_array); glw->glBindVertexArray(prev_pass->vertex_array);
glw->glGenBuffers(1, &vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
glw->glVertexAttribPointer(prev_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(prev_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0);
glw->glGenBuffers(1, &vbo->tex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->tex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
glw->glVertexAttribPointer(prev_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(prev_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0);
@ -939,11 +934,11 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
struct shader_prev* prev = &shader->prev[j]; struct shader_prev* prev = &shader->prev[j];
struct shader_vbo* prev_vbo = &prev->vbo; struct shader_vbo* prev_vbo = &prev->vbo;
glw->glGenBuffers(1, &prev_vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&prev_vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
glw->glGenBuffers(1, &prev_vbo->tex_coord); glw->glGenBuffers(1, (GLuint *)&prev_vbo->tex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->tex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->tex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
} }
@ -960,12 +955,12 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
struct shader_vbo* vbo = &final_pass->vbo; struct shader_vbo* vbo = &final_pass->vbo;
glw->glGenBuffers(1, &vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
glw->glVertexAttribPointer(final_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(final_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0);
glw->glGenBuffers(1, &vbo->tex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->tex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
glw->glVertexAttribPointer(final_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(final_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2*sizeof(GLfloat), (GLvoid*)0);
@ -979,12 +974,12 @@ int gl3_init(SDL_Window* window, sdl_render_driver requested_render_driver, BITM
struct shader_vbo* vbo = &color_pass->vbo; struct shader_vbo* vbo = &color_pass->vbo;
glw->glGenBuffers(1, &vbo->vertex_coord); glw->glGenBuffers(1, (GLuint *)&vbo->vertex_coord);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
glw->glVertexAttribPointer(color_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(color_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2*sizeof(GLfloat), (GLvoid*)0);
glw->glGenBuffers(1, &vbo->color); glw->glGenBuffers(1, (GLuint *)&vbo->color);
glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->color); glw->glBindBuffer(GL_ARRAY_BUFFER, vbo->color);
glw->glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_DYNAMIC_DRAW); glw->glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_DYNAMIC_DRAW);
glw->glVertexAttribPointer(color_pass->uniforms.color, 4, GL_FLOAT, GL_TRUE, 4*sizeof(GLfloat), (GLvoid*)0); glw->glVertexAttribPointer(color_pass->uniforms.color, 4, GL_FLOAT, GL_TRUE, 4*sizeof(GLfloat), (GLvoid*)0);
@ -1058,8 +1053,6 @@ struct render_data {
static void render_pass(struct render_data* data) static void render_pass(struct render_data* data)
{ {
int i; int i;
char s[64];
GLint loc;
GLuint texture_unit = 0; GLuint texture_unit = 0;
// pclog("pass %d: %gx%g, %gx%g -> %gx%g, %gx%g, %gx%g\n", num_pass, pass->state.input_size[0], pass->state.input_size[1], pass->state.input_texture_size[0], pass->state.input_texture_size[1], pass->state.output_size[0], pass->state.output_size[1], pass->state.output_texture_size[0], pass->state.output_texture_size[1], output_size[0], output_size[1]); // pclog("pass %d: %gx%g, %gx%g -> %gx%g, %gx%g, %gx%g\n", num_pass, pass->state.input_size[0], pass->state.input_size[1], pass->state.input_texture_size[0], pass->state.input_texture_size[1], pass->state.output_size[0], pass->state.output_size[1], pass->state.output_texture_size[0], pass->state.output_texture_size[1], output_size[0], output_size[1]);
@ -1207,7 +1200,6 @@ void gl3_present(SDL_Window* window, SDL_Rect video_rect, SDL_Rect window_rect,
return; return;
int s, i, j; int s, i, j;
GLuint p;
Uint32 ticks = SDL_GetTicks(); Uint32 ticks = SDL_GetTicks();
@ -1292,7 +1284,6 @@ void gl3_present(SDL_Window* window, SDL_Rect video_rect, SDL_Rect window_rect,
for (s = 0; s < active_shader->num_shaders; ++s) for (s = 0; s < active_shader->num_shaders; ++s)
{ {
struct glsl_shader* shader = &active_shader->shaders[s]; struct glsl_shader* shader = &active_shader->shaders[s];
int last_shader = s == active_shader->num_shaders-1;
// float refresh_rate = shader->shader_refresh_rate; // float refresh_rate = shader->shader_refresh_rate;
// if (refresh_rate < 0) // if (refresh_rate < 0)

2
src/wx-shader_man.c
View file

@ -47,7 +47,6 @@ static void add_shader(int p, const char* s)
static int shader_list_update(void* hdlg) static int shader_list_update(void* hdlg)
{ {
char s[512];
int c; int c;
void* h; void* h;
int num = 0; int num = 0;
@ -172,7 +171,6 @@ static int shader_manager_dlgproc(void* hdlg, int message, INT_PARAM wParam, LON
} }
else if (wParam == WX_ID("IDC_REMOVE")) else if (wParam == WX_ID("IDC_REMOVE"))
{ {
char name[64];
void* h; void* h;
int c; int c;
h = wx_getdlgitem(hdlg, WX_ID("IDC_LIST")); h = wx_getdlgitem(hdlg, WX_ID("IDC_LIST"));

2
src/wx-status.cc
View file

@ -138,7 +138,7 @@ void StatusPane::Render(wxDC& dc)
size = dc.GetTextExtent(s); size = dc.GetTextExtent(s);
dc.DrawText(s, x, height+5+(bitmap.GetHeight()-size.y)/2); dc.DrawText(s, x, height+5+(bitmap.GetHeight()-size.y)/2);
width = MAX(width, x+size.x); width = MAX(width, x+size.x);
height = MAX(height, height+5+MAX(bitmap.GetHeight(), size.y)); height = height+5+MAX(bitmap.GetHeight(), size.y);
} else { } else {
x -= bitmap.GetWidth(); x -= bitmap.GetWidth();
dc.DrawBitmap(bitmap, x, 5); dc.DrawBitmap(bitmap, x, 5);

2
src/wx-utils.cc
View file

@ -280,7 +280,7 @@ int wx_sendmessage(void* window, int type, INT_PARAM param1, LONG_PARAM param2)
((wxComboBox*) window)->Append((char*) param2); ((wxComboBox*) window)->Append((char*) param2);
break; break;
case WX_CB_SETCURSEL: case WX_CB_SETCURSEL:
if (param1 >= 0 && param1 < ((wxComboBox*) window)->GetCount()) if (param1 >= 0 && param1 < (int)((wxComboBox*) window)->GetCount())
((wxComboBox*) window)->Select(param1); ((wxComboBox*) window)->Select(param1);
break; break;
case WX_CB_GETCURSEL: case WX_CB_GETCURSEL: