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

Remove 'shader' param from shader param functions

Browse Source
This commit is contained in:
jp9000
2014-06-25 19:50:08 -07:00
parent 27010a2f56
commit caf8ca9ba8
9 changed files with 155 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/graphics/effect.c
View File

@@ -104,7 +104,7 @@ static void upload_shader_params(shader_t shader, struct darray *pass_params,
continue;
}
shader_setval(shader, sparam, eparam->cur_val.array,
shader_setval(sparam, eparam->cur_val.array,
eparam->cur_val.num);
}
}
@@ -178,9 +178,9 @@ static inline void clear_tex_params(shader_t shader, struct darray *in_params)
struct pass_shaderparam *param = params+i;
struct shader_param_info info;
shader_getparaminfo(shader, param->sparam, &info);
shader_getparaminfo(param->sparam, &info);
if (info.type == SHADER_PARAM_TEXTURE)
shader_settexture(shader, param->sparam, NULL);
shader_settexture(param->sparam, NULL);
}
}

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

@@ -149,9 +149,9 @@ bool load_graphics_imports(struct gs_exports *exports, void *module,
GRAPHICS_IMPORT(shader_numparams);
GRAPHICS_IMPORT(shader_getparambyidx);
GRAPHICS_IMPORT(shader_getparambyname);
GRAPHICS_IMPORT(shader_getparaminfo);
GRAPHICS_IMPORT(shader_getviewprojmatrix);
GRAPHICS_IMPORT(shader_getworldmatrix);
GRAPHICS_IMPORT(shader_getparaminfo);
GRAPHICS_IMPORT(shader_setbool);
GRAPHICS_IMPORT(shader_setfloat);
GRAPHICS_IMPORT(shader_setint);

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

@@ -177,28 +177,21 @@ struct gs_exports {
int (*shader_numparams)(shader_t shader);
sparam_t (*shader_getparambyidx)(shader_t shader, uint32_t param);
sparam_t (*shader_getparambyname)(shader_t shader, const char *name);
void (*shader_getparaminfo)(shader_t shader, sparam_t param,
struct shader_param_info *info);
sparam_t (*shader_getviewprojmatrix)(shader_t shader);
sparam_t (*shader_getworldmatrix)(shader_t shader);
void (*shader_setbool)(shader_t shader, sparam_t param, bool val);
void (*shader_setfloat)(shader_t shader, sparam_t param, float val);
void (*shader_setint)(shader_t shader, sparam_t param, int val);
void (*shader_setmatrix3)(shader_t shader, sparam_t param,
const struct matrix3 *val);
void (*shader_setmatrix4)(shader_t shader, sparam_t param,
const struct matrix4 *val);
void (*shader_setvec2)(shader_t shader, sparam_t param,
const struct vec2 *val);
void (*shader_setvec3)(shader_t shader, sparam_t param,
const struct vec3 *val);
void (*shader_setvec4)(shader_t shader, sparam_t param,
const struct vec4 *val);
void (*shader_settexture)(shader_t shader, sparam_t param,
texture_t val);
void (*shader_setval)(shader_t shader, sparam_t param, const void *val,
size_t size);
void (*shader_setdefault)(shader_t shader, sparam_t param);
void (*shader_getparaminfo)(sparam_t param,
struct shader_param_info *info);
void (*shader_setbool)(sparam_t param, bool val);
void (*shader_setfloat)(sparam_t param, float val);
void (*shader_setint)(sparam_t param, int val);
void (*shader_setmatrix3)(sparam_t param, const struct matrix3 *val);
void (*shader_setmatrix4)(sparam_t param, const struct matrix4 *val);
void (*shader_setvec2)(sparam_t param, const struct vec2 *val);
void (*shader_setvec3)(sparam_t param, const struct vec3 *val);
void (*shader_setvec4)(sparam_t param, const struct vec4 *val);
void (*shader_settexture)(sparam_t param, texture_t val);
void (*shader_setval)(sparam_t param, const void *val, size_t size);
void (*shader_setdefault)(sparam_t param);
#ifdef __APPLE__
/* OSX/Cocoa specific functions */

89
libobs/graphics/graphics.c
View File

@@ -1509,15 +1509,6 @@ sparam_t shader_getparambyname(shader_t shader, const char *name)
return graphics->exports.shader_getparambyname(shader, name);
}
void shader_getparaminfo(shader_t shader, sparam_t param,
struct shader_param_info *info)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
graphics->exports.shader_getparaminfo(shader, param, info);
}
sparam_t shader_getviewprojmatrix(shader_t shader)
{
graphics_t graphics = thread_graphics;
@@ -1534,98 +1525,100 @@ sparam_t shader_getworldmatrix(shader_t shader)
return graphics->exports.shader_getworldmatrix(shader);
}
void shader_setbool(shader_t shader, sparam_t param, bool val)
void shader_getparaminfo(sparam_t param, struct shader_param_info *info)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setbool(shader, param, val);
graphics->exports.shader_getparaminfo(param, info);
}
void shader_setfloat(shader_t shader, sparam_t param, float val)
void shader_setbool(sparam_t param, bool val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setfloat(shader, param, val);
graphics->exports.shader_setbool(param, val);
}
void shader_setint(shader_t shader, sparam_t param, int val)
void shader_setfloat(sparam_t param, float val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setint(shader, param, val);
graphics->exports.shader_setfloat(param, val);
}
void shader_setmatrix3(shader_t shader, sparam_t param,
const struct matrix3 *val)
void shader_setint(sparam_t param, int val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setmatrix3(shader, param, val);
graphics->exports.shader_setint(param, val);
}
void shader_setmatrix4(shader_t shader, sparam_t param,
const struct matrix4 *val)
void shader_setmatrix3(sparam_t param, const struct matrix3 *val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setmatrix4(shader, param, val);
graphics->exports.shader_setmatrix3(param, val);
}
void shader_setvec2(shader_t shader, sparam_t param,
const struct vec2 *val)
void shader_setmatrix4(sparam_t param, const struct matrix4 *val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setvec2(shader, param, val);
graphics->exports.shader_setmatrix4(param, val);
}
void shader_setvec3(shader_t shader, sparam_t param,
const struct vec3 *val)
void shader_setvec2(sparam_t param, const struct vec2 *val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setvec3(shader, param, val);
graphics->exports.shader_setvec2(param, val);
}
void shader_setvec4(shader_t shader, sparam_t param,
const struct vec4 *val)
void shader_setvec3(sparam_t param, const struct vec3 *val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setvec4(shader, param, val);
graphics->exports.shader_setvec3(param, val);
}
void shader_settexture(shader_t shader, sparam_t param, texture_t val)
void shader_setvec4(sparam_t param, const struct vec4 *val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_settexture(shader, param, val);
graphics->exports.shader_setvec4(param, val);
}
void shader_setval(shader_t shader, sparam_t param, const void *val,
size_t size)
void shader_settexture(sparam_t param, texture_t val)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setval(shader, param, val, size);
graphics->exports.shader_settexture(param, val);
}
void shader_setdefault(shader_t shader, sparam_t param)
void shader_setval(sparam_t param, const void *val, size_t size)
{
graphics_t graphics = thread_graphics;
if (!graphics || !shader || !param) return;
if (!graphics || !param) return;
graphics->exports.shader_setdefault(shader, param);
graphics->exports.shader_setval(param, val, size);
}
void shader_setdefault(sparam_t param)
{
graphics_t graphics = thread_graphics;
if (!graphics || !param) return;
graphics->exports.shader_setdefault(param);
}
void texture_destroy(texture_t tex)

31
libobs/graphics/graphics.h
View File

@@ -295,29 +295,22 @@ EXPORT void shader_destroy(shader_t shader);
EXPORT int shader_numparams(shader_t shader);
EXPORT sparam_t shader_getparambyidx(shader_t shader, uint32_t param);
EXPORT sparam_t shader_getparambyname(shader_t shader, const char *name);
EXPORT void shader_getparaminfo(shader_t shader, sparam_t param,
struct shader_param_info *info);
EXPORT sparam_t shader_getviewprojmatrix(shader_t shader);
EXPORT sparam_t shader_getworldmatrix(shader_t shader);
EXPORT void shader_setbool(shader_t shader, sparam_t param, bool val);
EXPORT void shader_setfloat(shader_t shader, sparam_t param, float val);
EXPORT void shader_setint(shader_t shader, sparam_t param, int val);
EXPORT void shader_setmatrix3(shader_t shader, sparam_t param,
const struct matrix3 *val);
EXPORT void shader_setmatrix4(shader_t shader, sparam_t param,
const struct matrix4 *val);
EXPORT void shader_setvec2(shader_t shader, sparam_t param,
const struct vec2 *val);
EXPORT void shader_setvec3(shader_t shader, sparam_t param,
const struct vec3 *val);
EXPORT void shader_setvec4(shader_t shader, sparam_t param,
const struct vec4 *val);
EXPORT void shader_settexture(shader_t shader, sparam_t param, texture_t val);
EXPORT void shader_setval(shader_t shader, sparam_t param, const void *val,
size_t size);
EXPORT void shader_setdefault(shader_t shader, sparam_t param);
EXPORT void shader_getparaminfo(sparam_t param, struct shader_param_info *info);
EXPORT void shader_setbool(sparam_t param, bool val);
EXPORT void shader_setfloat(sparam_t param, float val);
EXPORT void shader_setint(sparam_t param, int val);
EXPORT void shader_setmatrix3(sparam_t param, const struct matrix3 *val);
EXPORT void shader_setmatrix4(sparam_t param, const struct matrix4 *val);
EXPORT void shader_setvec2(sparam_t param, const struct vec2 *val);
EXPORT void shader_setvec3(sparam_t param, const struct vec3 *val);
EXPORT void shader_setvec4(sparam_t param, const struct vec4 *val);
EXPORT void shader_settexture(sparam_t param, texture_t val);
EXPORT void shader_setval(sparam_t param, const void *val, size_t size);
EXPORT void shader_setdefault(sparam_t param);
/* ---------------------------------------------------
* effect functions