summaryrefslogtreecommitdiff
path: root/cogl/driver
diff options
context:
space:
mode:
Diffstat (limited to 'cogl/driver')
-rw-r--r--cogl/driver/gl/cogl-program.c18
-rw-r--r--cogl/driver/gl/cogl-shader.c2
-rw-r--r--cogl/driver/gl/cogl-texture-driver.c2
-rw-r--r--cogl/driver/gl/cogl.c8
-rw-r--r--cogl/driver/gles/cogl-gles2-wrapper.c6
-rw-r--r--cogl/driver/gles/cogl-gles2-wrapper.h12
-rw-r--r--cogl/driver/gles/cogl-program.c42
-rw-r--r--cogl/driver/gles/cogl-shader.c4
-rw-r--r--cogl/driver/gles/cogl-texture-driver.c4
9 files changed, 49 insertions, 49 deletions
diff --git a/cogl/driver/gl/cogl-program.c b/cogl/driver/gl/cogl-program.c
index 3cd48ecf..39b096a4 100644
--- a/cogl/driver/gl/cogl-program.c
+++ b/cogl/driver/gl/cogl-program.c
@@ -145,7 +145,7 @@ cogl_program_use (CoglHandle handle)
int
cogl_program_get_uniform_location (CoglHandle handle,
- const gchar *uniform_name)
+ const char *uniform_name)
{
CoglProgram *program;
_COGL_GET_CONTEXT (ctx, 0);
@@ -160,7 +160,7 @@ cogl_program_get_uniform_location (CoglHandle handle,
void
cogl_program_uniform_1f (int uniform_no,
- gfloat value)
+ float value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
glUniform1f (uniform_no, value);
@@ -168,7 +168,7 @@ cogl_program_uniform_1f (int uniform_no,
void
cogl_program_uniform_1i (int uniform_no,
- gint value)
+ int value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
glUniform1i (uniform_no, value);
@@ -176,8 +176,8 @@ cogl_program_uniform_1i (int uniform_no,
void
cogl_program_uniform_float (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const GLfloat *value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -203,8 +203,8 @@ cogl_program_uniform_float (int uniform_no,
void
cogl_program_uniform_int (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const int *value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -230,8 +230,8 @@ cogl_program_uniform_int (int uniform_no,
void
cogl_program_uniform_matrix (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
gboolean transpose,
const GLfloat *value)
{
diff --git a/cogl/driver/gl/cogl-shader.c b/cogl/driver/gl/cogl-shader.c
index f02f2131..7c2abdcd 100644
--- a/cogl/driver/gl/cogl-shader.c
+++ b/cogl/driver/gl/cogl-shader.c
@@ -107,7 +107,7 @@ cogl_shader_compile (CoglHandle handle)
glCompileShader (shader->gl_handle);
}
-gchar *
+char *
cogl_shader_get_info_log (CoglHandle handle)
{
CoglShader *shader;
diff --git a/cogl/driver/gl/cogl-texture-driver.c b/cogl/driver/gl/cogl-texture-driver.c
index 5d7c9f86..46e50a9a 100644
--- a/cogl/driver/gl/cogl-texture-driver.c
+++ b/cogl/driver/gl/cogl-texture-driver.c
@@ -52,7 +52,7 @@ _cogl_texture_driver_gen (GLenum gl_target,
GLsizei n,
GLuint *textures)
{
- guint i;
+ unsigned int i;
GE (glGenTextures (n, textures));
diff --git a/cogl/driver/gl/cogl.c b/cogl/driver/gl/cogl.c
index f6a3b5c4..72c7b160 100644
--- a/cogl/driver/gl/cogl.c
+++ b/cogl/driver/gl/cogl.c
@@ -98,7 +98,7 @@ gboolean
_cogl_check_driver_valid (GError **error)
{
int major, minor;
- const gchar *gl_extensions;
+ const char *gl_extensions;
if (!_cogl_get_gl_version (&major, &minor))
{
@@ -113,7 +113,7 @@ _cogl_check_driver_valid (GError **error)
if (COGL_CHECK_GL_VERSION (major, minor, 1, 3))
return TRUE;
- gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS);
+ gl_extensions = (const char*) glGetString (GL_EXTENSIONS);
/* OpenGL 1.2 is only supported if we have the multitexturing
extension */
@@ -175,7 +175,7 @@ void
_cogl_features_init (void)
{
CoglFeatureFlags flags = 0;
- const gchar *gl_extensions;
+ const char *gl_extensions;
GLint max_clip_planes = 0;
GLint num_stencil_bits = 0;
int gl_major = 0, gl_minor = 0;
@@ -187,7 +187,7 @@ _cogl_features_init (void)
flags = COGL_FEATURE_TEXTURE_READ_PIXELS;
- gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS);
+ gl_extensions = (const char*) glGetString (GL_EXTENSIONS);
if (COGL_CHECK_GL_VERSION (gl_major, gl_minor, 2, 0) ||
_cogl_check_extension ("GL_ARB_texture_non_power_of_two", gl_extensions))
diff --git a/cogl/driver/gles/cogl-gles2-wrapper.c b/cogl/driver/gles/cogl-gles2-wrapper.c
index 65d29956..f3a9e83b 100644
--- a/cogl/driver/gles/cogl-gles2-wrapper.c
+++ b/cogl/driver/gles/cogl-gles2-wrapper.c
@@ -788,7 +788,7 @@ cogl_gles2_do_set_uniform (GLint location, CoglBoxedValue *value)
case COGL_BOXED_INT:
{
- gint *ptr;
+ int *ptr;
if (value->count == 1)
ptr = value->v.int_value;
@@ -807,7 +807,7 @@ cogl_gles2_do_set_uniform (GLint location, CoglBoxedValue *value)
case COGL_BOXED_FLOAT:
{
- gfloat *ptr;
+ float *ptr;
if (value->count == 1)
ptr = value->v.float_value;
@@ -826,7 +826,7 @@ cogl_gles2_do_set_uniform (GLint location, CoglBoxedValue *value)
case COGL_BOXED_MATRIX:
{
- gfloat *ptr;
+ float *ptr;
if (value->count == 1)
ptr = value->v.matrix;
diff --git a/cogl/driver/gles/cogl-gles2-wrapper.h b/cogl/driver/gles/cogl-gles2-wrapper.h
index 52b81238..33287e01 100644
--- a/cogl/driver/gles/cogl-gles2-wrapper.h
+++ b/cogl/driver/gles/cogl-gles2-wrapper.h
@@ -128,8 +128,8 @@ struct _CoglGles2WrapperSettings
/* The current in-use user program */
CoglHandle user_program;
- guint alpha_test_enabled:1;
- guint fog_enabled:1;
+ unsigned int alpha_test_enabled:1;
+ unsigned int fog_enabled:1;
};
struct _CoglGles2WrapperTextureUnit
@@ -141,8 +141,8 @@ struct _CoglGles2WrapperTextureUnit
GLsizei texture_coords_stride;
const void *texture_coords_pointer;
- guint texture_coords_enabled:1;
- guint dirty_matrix:1; /*!< shader uniform needs updating */
+ unsigned int texture_coords_enabled:1;
+ unsigned int dirty_matrix:1; /*!< shader uniform needs updating */
};
struct _CoglGles2Wrapper
@@ -150,8 +150,8 @@ struct _CoglGles2Wrapper
GLuint matrix_mode;
CoglMatrix modelview_matrix;
CoglMatrix projection_matrix;
- guint active_texture_unit;
- guint active_client_texture_unit;
+ unsigned int active_texture_unit;
+ unsigned int active_client_texture_unit;
CoglGles2WrapperTextureUnit texture_units[COGL_GLES2_MAX_TEXTURE_UNITS];
diff --git a/cogl/driver/gles/cogl-program.c b/cogl/driver/gles/cogl-program.c
index 088cecfe..8fc372b9 100644
--- a/cogl/driver/gles/cogl-program.c
+++ b/cogl/driver/gles/cogl-program.c
@@ -124,7 +124,7 @@ cogl_program_use (CoglHandle handle)
int
cogl_program_get_uniform_location (CoglHandle handle,
- const gchar *uniform_name)
+ const char *uniform_name)
{
int i;
CoglProgram *program;
@@ -156,24 +156,24 @@ cogl_program_get_uniform_location (CoglHandle handle,
void
cogl_program_uniform_1f (int uniform_no,
- gfloat value)
+ float value)
{
cogl_program_uniform_float (uniform_no, 1, 1, &value);
}
void
cogl_program_uniform_1i (int uniform_no,
- gint value)
+ int value)
{
cogl_program_uniform_int (uniform_no, 1, 1, &value);
}
static void
cogl_program_uniform_x (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
CoglBoxedType type,
- size_t value_size,
+ gsize value_size,
gconstpointer value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -216,8 +216,8 @@ cogl_program_uniform_x (int uniform_no,
void
cogl_program_uniform_float (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const GLfloat *value)
{
cogl_program_uniform_x (uniform_no, size, count, COGL_BOXED_FLOAT,
@@ -226,18 +226,18 @@ cogl_program_uniform_float (int uniform_no,
void
cogl_program_uniform_int (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const GLint *value)
{
cogl_program_uniform_x (uniform_no, size, count, COGL_BOXED_INT,
- sizeof (gint) * size, value);
+ sizeof (int) * size, value);
}
void
cogl_program_uniform_matrix (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
gboolean transpose,
const GLfloat *value)
{
@@ -298,37 +298,37 @@ cogl_program_use (CoglHandle program_handle)
int
cogl_program_get_uniform_location (CoglHandle program_handle,
- const gchar *uniform_name)
+ const char *uniform_name)
{
return 0;
}
void
cogl_program_uniform_1f (int uniform_no,
- gfloat value)
+ float value)
{
}
void
cogl_program_uniform_float (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const GLfloat *value)
{
}
void
cogl_program_uniform_int (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
const int *value)
{
}
void
cogl_program_uniform_matrix (int uniform_no,
- gint size,
- gint count,
+ int size,
+ int count,
gboolean transpose,
const GLfloat *value)
{
diff --git a/cogl/driver/gles/cogl-shader.c b/cogl/driver/gles/cogl-shader.c
index 23109be3..ae4d6b31 100644
--- a/cogl/driver/gles/cogl-shader.c
+++ b/cogl/driver/gles/cogl-shader.c
@@ -99,7 +99,7 @@ cogl_shader_compile (CoglHandle handle)
glCompileShader (shader->gl_handle);
}
-gchar *
+char *
cogl_shader_get_info_log (CoglHandle handle)
{
CoglShader *shader;
@@ -200,7 +200,7 @@ cogl_shader_compile (CoglHandle shader_handle)
{
}
-gchar *
+char *
cogl_shader_get_info_log (CoglHandle handle)
{
return NULL;
diff --git a/cogl/driver/gles/cogl-texture-driver.c b/cogl/driver/gles/cogl-texture-driver.c
index 41cc9a82..0fc6744c 100644
--- a/cogl/driver/gles/cogl-texture-driver.c
+++ b/cogl/driver/gles/cogl-texture-driver.c
@@ -52,7 +52,7 @@ _cogl_texture_driver_gen (GLenum gl_target,
GLsizei n,
GLuint *textures)
{
- guint i;
+ unsigned int i;
GE (glGenTextures (n, textures));
@@ -125,7 +125,7 @@ _cogl_texture_driver_upload_subregion_to_gl (GLenum gl_target,
slice_bmp.width = width;
slice_bmp.height = height;
slice_bmp.rowstride = bpp * slice_bmp.width;
- slice_bmp.data = (guchar*) g_malloc (slice_bmp.rowstride * slice_bmp.height);
+ slice_bmp.data = g_malloc (slice_bmp.rowstride * slice_bmp.height);
/* Setup gl alignment to match rowstride and top-left corner */
_cogl_texture_driver_prep_gl_for_pixels_upload (slice_bmp.rowstride,
View Lorry Controller Status