[248/906] fix msvc warnings and update CMake build, win32 CodeBlocks build and vs8 build

This commit is contained in:
Julien Isorce 2008-10-16 23:47:01 +02:00 committed by Matthew Waters
parent 0ac54fdc55
commit 25af2c116e
2 changed files with 32 additions and 31 deletions

View file

@ -48,7 +48,8 @@ add_library (gstopengl SHARED
effects/gstgleffectlumatocurve.c effects/gstgleffectlumatocurve.c
effects/gstgleffectrgbtocurve.c effects/gstgleffectrgbtocurve.c
effects/gstgleffectsin.c effects/gstgleffectsin.c
effects/gstgleffectglow.c) effects/gstgleffectglow.c
effects/gstgleffectxray.c)
target_link_libraries(gstopengl target_link_libraries(gstopengl
general gstgl general gstgl

View file

@ -23,9 +23,9 @@
#include <gstgleffectlumatocurve.h> #include <gstgleffectlumatocurve.h>
/* Gaussian Kernel: std = 1.200000, size = 9x1 */ /* Gaussian Kernel: std = 1.200000, size = 9x1 */
static gfloat gauss_kernel[9] = { 0.001285, 0.014607, 0.082898, static gfloat gauss_kernel[9] = { 0.001285f, 0.014607f, 0.082898f,
0.234927, 0.332452, 0.234927, 0.234927f, 0.332452f, 0.234927f,
0.082898, 0.014607, 0.001285 }; 0.082898f, 0.014607f, 0.001285f };
/* Normalization Constant = 0.999885 */ /* Normalization Constant = 0.999885 */
static void gst_gl_effects_xray_step_one (gint width, gint height, guint texture, gpointer data) static void gst_gl_effects_xray_step_one (gint width, gint height, guint texture, gpointer data)
@ -66,7 +66,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture, gpointer d
gst_gl_shader_set_uniform_1i (shader, "tex", 1); gst_gl_shader_set_uniform_1i (shader, "tex", 1);
gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel); gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel);
gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.999885); gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.999885f);
gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f); gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f);
gst_gl_effects_draw_texture (effects, texture); gst_gl_effects_draw_texture (effects, texture);
@ -102,7 +102,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture, gpointer
gst_gl_shader_set_uniform_1i (shader, "tex", 1); gst_gl_shader_set_uniform_1i (shader, "tex", 1);
gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel); gst_gl_shader_set_uniform_1fv (shader, "kernel", 9, gauss_kernel);
gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.999885); gst_gl_shader_set_uniform_1f (shader, "norm_const", 0.999885f);
gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f); gst_gl_shader_set_uniform_1f (shader, "norm_offset", 0.0f);
gst_gl_effects_draw_texture (effects, texture); gst_gl_effects_draw_texture (effects, texture);