From ccfd57d100e9e6e81281af0d8659976efb5354d1 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 21 Oct 2015 07:43:02 -0700 Subject: [PATCH] libobs/graphics: Rename inconsistent function names Renames functions: gs_shader_setmatrix3 -> gs_shader_set_matrix3 gs_voltexture_getdepth -> gs_voltexture_get_depth --- libobs-d3d11/d3d11-shader.cpp | 2 +- libobs-d3d11/d3d11-subsystem.cpp | 2 +- libobs-opengl/gl-shader.c | 2 +- libobs-opengl/gl-subsystem.c | 2 +- libobs/graphics/graphics-imports.c | 4 ++-- libobs/graphics/graphics-internal.h | 4 ++-- libobs/graphics/graphics.c | 12 ++++++------ libobs/graphics/graphics.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libobs-d3d11/d3d11-shader.cpp b/libobs-d3d11/d3d11-shader.cpp index 0c6a5065c..2f9437d5e 100644 --- a/libobs-d3d11/d3d11-shader.cpp +++ b/libobs-d3d11/d3d11-shader.cpp @@ -340,7 +340,7 @@ void gs_shader_set_int(gs_sparam_t *param, int val) shader_setval_inline(param, &val, sizeof(int)); } -void gs_shader_setmatrix3(gs_sparam_t *param, const struct matrix3 *val) +void gs_shader_set_matrix3(gs_sparam_t *param, const struct matrix3 *val) { struct matrix4 mat; matrix4_from_matrix3(&mat, val); diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 47d911e68..311b7ca28 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -1734,7 +1734,7 @@ uint32_t gs_voltexture_get_height(const gs_texture_t *voltex) return 0; } -uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex) +uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex) { /* TODO */ UNUSED_PARAMETER(voltex); diff --git a/libobs-opengl/gl-shader.c b/libobs-opengl/gl-shader.c index b808f5a6d..650b29ecb 100644 --- a/libobs-opengl/gl-shader.c +++ b/libobs-opengl/gl-shader.c @@ -395,7 +395,7 @@ void gs_shader_set_int(gs_sparam_t *param, int val) da_copy_array(param->cur_value, &val, sizeof(val)); } -void gs_shader_setmatrix3(gs_sparam_t *param, const struct matrix3 *val) +void gs_shader_set_matrix3(gs_sparam_t *param, const struct matrix3 *val) { struct matrix4 mat; matrix4_from_matrix3(&mat, val); diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index 9f5adf145..e43d83913 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -1359,7 +1359,7 @@ uint32_t gs_voltexture_get_height(const gs_texture_t *voltex) return 0; } -uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex) +uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex) { /* TODO */ UNUSED_PARAMETER(voltex); diff --git a/libobs/graphics/graphics-imports.c b/libobs/graphics/graphics-imports.c index cdf9cfb58..dbe1eb61e 100644 --- a/libobs/graphics/graphics-imports.c +++ b/libobs/graphics/graphics-imports.c @@ -125,7 +125,7 @@ bool load_graphics_imports(struct gs_exports *exports, void *module, GRAPHICS_IMPORT(gs_voltexture_destroy); GRAPHICS_IMPORT(gs_voltexture_get_width); GRAPHICS_IMPORT(gs_voltexture_get_height); - GRAPHICS_IMPORT(gs_voltexture_getdepth); + GRAPHICS_IMPORT(gs_voltexture_get_depth); GRAPHICS_IMPORT(gs_voltexture_get_color_format); GRAPHICS_IMPORT(gs_stagesurface_destroy); @@ -159,7 +159,7 @@ bool load_graphics_imports(struct gs_exports *exports, void *module, GRAPHICS_IMPORT(gs_shader_set_bool); GRAPHICS_IMPORT(gs_shader_set_float); GRAPHICS_IMPORT(gs_shader_set_int); - GRAPHICS_IMPORT(gs_shader_setmatrix3); + GRAPHICS_IMPORT(gs_shader_set_matrix3); GRAPHICS_IMPORT(gs_shader_set_matrix4); GRAPHICS_IMPORT(gs_shader_set_vec2); GRAPHICS_IMPORT(gs_shader_set_vec3); diff --git a/libobs/graphics/graphics-internal.h b/libobs/graphics/graphics-internal.h index caed7a2c6..6c2333d36 100644 --- a/libobs/graphics/graphics-internal.h +++ b/libobs/graphics/graphics-internal.h @@ -170,7 +170,7 @@ struct gs_exports { void (*gs_voltexture_destroy)(gs_texture_t *voltex); uint32_t (*gs_voltexture_get_width)(const gs_texture_t *voltex); uint32_t (*gs_voltexture_get_height)(const gs_texture_t *voltex); - uint32_t (*gs_voltexture_getdepth)(const gs_texture_t *voltex); + uint32_t (*gs_voltexture_get_depth)(const gs_texture_t *voltex); enum gs_color_format (*gs_voltexture_get_color_format)( const gs_texture_t *voltex); @@ -214,7 +214,7 @@ struct gs_exports { void (*gs_shader_set_bool)(gs_sparam_t *param, bool val); void (*gs_shader_set_float)(gs_sparam_t *param, float val); void (*gs_shader_set_int)(gs_sparam_t *param, int val); - void (*gs_shader_setmatrix3)(gs_sparam_t *param, + void (*gs_shader_set_matrix3)(gs_sparam_t *param, const struct matrix3 *val); void (*gs_shader_set_matrix4)(gs_sparam_t *param, const struct matrix4 *val); diff --git a/libobs/graphics/graphics.c b/libobs/graphics/graphics.c index abdab2057..b218b54aa 100644 --- a/libobs/graphics/graphics.c +++ b/libobs/graphics/graphics.c @@ -1983,14 +1983,14 @@ void gs_shader_set_int(gs_sparam_t *param, int val) graphics->exports.gs_shader_set_int(param, val); } -void gs_shader_setmatrix3(gs_sparam_t *param, const struct matrix3 *val) +void gs_shader_set_matrix3(gs_sparam_t *param, const struct matrix3 *val) { graphics_t *graphics = thread_graphics; - if (!gs_valid_p2("gs_shader_setmatrix3", param, val)) + if (!gs_valid_p2("gs_shader_set_matrix3", param, val)) return; - graphics->exports.gs_shader_setmatrix3(param, val); + graphics->exports.gs_shader_set_matrix3(param, val); } void gs_shader_set_matrix4(gs_sparam_t *param, const struct matrix4 *val) @@ -2207,14 +2207,14 @@ uint32_t gs_voltexture_get_height(const gs_texture_t *voltex) return graphics->exports.gs_voltexture_get_height(voltex); } -uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex) +uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex) { graphics_t *graphics = thread_graphics; - if (!gs_valid_p("gs_voltexture_getdepth", voltex)) + if (!gs_valid_p("gs_voltexture_get_depth", voltex)) return 0; - return graphics->exports.gs_voltexture_getdepth(voltex); + return graphics->exports.gs_voltexture_get_depth(voltex); } enum gs_color_format gs_voltexture_get_color_format(const gs_texture_t *voltex) diff --git a/libobs/graphics/graphics.h b/libobs/graphics/graphics.h index 7bb157a14..fe90ba0b5 100644 --- a/libobs/graphics/graphics.h +++ b/libobs/graphics/graphics.h @@ -314,7 +314,7 @@ EXPORT void gs_shader_get_param_info(const gs_sparam_t *param, EXPORT void gs_shader_set_bool(gs_sparam_t *param, bool val); EXPORT void gs_shader_set_float(gs_sparam_t *param, float val); EXPORT void gs_shader_set_int(gs_sparam_t *param, int val); -EXPORT void gs_shader_setmatrix3(gs_sparam_t *param, const struct matrix3 *val); +EXPORT void gs_shader_set_matrix3(gs_sparam_t *param, const struct matrix3 *val); EXPORT void gs_shader_set_matrix4(gs_sparam_t *param, const struct matrix4 *val); EXPORT void gs_shader_set_vec2(gs_sparam_t *param, const struct vec2 *val); EXPORT void gs_shader_set_vec3(gs_sparam_t *param, const struct vec3 *val); @@ -685,7 +685,7 @@ EXPORT enum gs_color_format gs_cubetexture_get_color_format( EXPORT void gs_voltexture_destroy(gs_texture_t *voltex); EXPORT uint32_t gs_voltexture_get_width(const gs_texture_t *voltex); EXPORT uint32_t gs_voltexture_get_height(const gs_texture_t *voltex); -EXPORT uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex); +EXPORT uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex); EXPORT enum gs_color_format gs_voltexture_get_color_format( const gs_texture_t *voltex);