jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs/graphics: Rename inconsistent function names 

Renames functions:
gs_shader_setmatrix3 -> gs_shader_set_matrix3
gs_voltexture_getdepth -> gs_voltexture_get_depth
master
jp9000 2015-10-21 07:43:02 -07:00
parent 03d6eab49d
commit ccfd57d100
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libobs-d3d11/d3d11-shader.cpp
View File

@ -340,7 +340,7 @@ void gs_shader_set_int(gs_sparam_t *param, int val)
shader_setval_inline(param, &val, sizeof(int)); 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; struct matrix4 mat;
matrix4_from_matrix3(&mat, val); matrix4_from_matrix3(&mat, val);

2
libobs-d3d11/d3d11-subsystem.cpp
View File

@ -1734,7 +1734,7 @@ uint32_t gs_voltexture_get_height(const gs_texture_t *voltex)
return 0; return 0;
} }
uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex) uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex)
{ {
/* TODO */ /* TODO */
UNUSED_PARAMETER(voltex); UNUSED_PARAMETER(voltex);

2
libobs-opengl/gl-shader.c
View File

@ -395,7 +395,7 @@ void gs_shader_set_int(gs_sparam_t *param, int val)
da_copy_array(param->cur_value, &val, sizeof(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; struct matrix4 mat;
matrix4_from_matrix3(&mat, val); matrix4_from_matrix3(&mat, val);

2
libobs-opengl/gl-subsystem.c
View File

@ -1359,7 +1359,7 @@ uint32_t gs_voltexture_get_height(const gs_texture_t *voltex)
return 0; return 0;
} }
uint32_t gs_voltexture_getdepth(const gs_texture_t *voltex) uint32_t gs_voltexture_get_depth(const gs_texture_t *voltex)
{ {
/* TODO */ /* TODO */
UNUSED_PARAMETER(voltex); UNUSED_PARAMETER(voltex);

4
libobs/graphics/graphics-imports.c
View File

@ -125,7 +125,7 @@ bool load_graphics_imports(struct gs_exports *exports, void *module,
GRAPHICS_IMPORT(gs_voltexture_destroy); GRAPHICS_IMPORT(gs_voltexture_destroy);
GRAPHICS_IMPORT(gs_voltexture_get_width); GRAPHICS_IMPORT(gs_voltexture_get_width);
GRAPHICS_IMPORT(gs_voltexture_get_height); 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_voltexture_get_color_format);
GRAPHICS_IMPORT(gs_stagesurface_destroy); 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_bool);
GRAPHICS_IMPORT(gs_shader_set_float); GRAPHICS_IMPORT(gs_shader_set_float);
GRAPHICS_IMPORT(gs_shader_set_int); 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_matrix4);
GRAPHICS_IMPORT(gs_shader_set_vec2); GRAPHICS_IMPORT(gs_shader_set_vec2);
GRAPHICS_IMPORT(gs_shader_set_vec3); GRAPHICS_IMPORT(gs_shader_set_vec3);

4
libobs/graphics/graphics-internal.h
View File

@ -170,7 +170,7 @@ struct gs_exports {
void (*gs_voltexture_destroy)(gs_texture_t *voltex); void (*gs_voltexture_destroy)(gs_texture_t *voltex);
uint32_t (*gs_voltexture_get_width)(const 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_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)( enum gs_color_format (*gs_voltexture_get_color_format)(
const gs_texture_t *voltex); 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_bool)(gs_sparam_t *param, bool val);
void (*gs_shader_set_float)(gs_sparam_t *param, float 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_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); const struct matrix3 *val);
void (*gs_shader_set_matrix4)(gs_sparam_t *param, void (*gs_shader_set_matrix4)(gs_sparam_t *param,
const struct matrix4 *val); const struct matrix4 *val);

12
libobs/graphics/graphics.c
View File

@ -1983,14 +1983,14 @@ void gs_shader_set_int(gs_sparam_t *param, int val)
graphics->exports.gs_shader_set_int(param, 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; 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; 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) 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); 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; 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 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) enum gs_color_format gs_voltexture_get_color_format(const gs_texture_t *voltex)

4
libobs/graphics/graphics.h
View File

@ -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_bool(gs_sparam_t *param, bool val);
EXPORT void gs_shader_set_float(gs_sparam_t *param, float 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_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_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_vec2(gs_sparam_t *param, const struct vec2 *val);
EXPORT void gs_shader_set_vec3(gs_sparam_t *param, const struct vec3 *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 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_width(const gs_texture_t *voltex);
EXPORT uint32_t gs_voltexture_get_height(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( EXPORT enum gs_color_format gs_voltexture_get_color_format(
const gs_texture_t *voltex); const gs_texture_t *voltex);