(API Change) Improve graphics API consistency
Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
This commit is contained in:
@@ -58,7 +58,7 @@ static inline void render_displays(void)
|
||||
if (!obs->data.valid)
|
||||
return;
|
||||
|
||||
gs_entercontext(obs->video.graphics);
|
||||
gs_enter_context(obs->video.graphics);
|
||||
|
||||
/* render extra displays/swaps */
|
||||
pthread_mutex_lock(&obs->data.displays_mutex);
|
||||
@@ -74,23 +74,23 @@ static inline void render_displays(void)
|
||||
/* render main display */
|
||||
render_display(&obs->video.main_display);
|
||||
|
||||
gs_leavecontext();
|
||||
gs_leave_context();
|
||||
}
|
||||
|
||||
static inline void set_render_size(uint32_t width, uint32_t height)
|
||||
{
|
||||
gs_enable_depthtest(false);
|
||||
gs_enable_depth_test(false);
|
||||
gs_enable_blending(false);
|
||||
gs_setcullmode(GS_NEITHER);
|
||||
gs_set_cull_mode(GS_NEITHER);
|
||||
|
||||
gs_ortho(0.0f, (float)width, 0.0f, (float)height, -100.0f, 100.0f);
|
||||
gs_setviewport(0, 0, width, height);
|
||||
gs_set_viewport(0, 0, width, height);
|
||||
}
|
||||
|
||||
static inline void unmap_last_surface(struct obs_core_video *video)
|
||||
{
|
||||
if (video->mapped_surface) {
|
||||
stagesurface_unmap(video->mapped_surface);
|
||||
gs_stagesurface_unmap(video->mapped_surface);
|
||||
video->mapped_surface = NULL;
|
||||
}
|
||||
}
|
||||
@@ -101,7 +101,7 @@ static inline void render_main_texture(struct obs_core_video *video,
|
||||
struct vec4 clear_color;
|
||||
vec4_set(&clear_color, 0.0f, 0.0f, 0.0f, 1.0f);
|
||||
|
||||
gs_setrendertarget(video->render_textures[cur_texture], NULL);
|
||||
gs_set_render_target(video->render_textures[cur_texture], NULL);
|
||||
gs_clear(GS_CLEAR_COLOR, &clear_color, 1.0f, 0);
|
||||
|
||||
set_render_size(video->base_width, video->base_height);
|
||||
@@ -113,22 +113,23 @@ static inline void render_main_texture(struct obs_core_video *video,
|
||||
static inline void render_output_texture(struct obs_core_video *video,
|
||||
int cur_texture, int prev_texture)
|
||||
{
|
||||
texture_t texture = video->render_textures[prev_texture];
|
||||
texture_t target = video->output_textures[cur_texture];
|
||||
uint32_t width = texture_getwidth(target);
|
||||
uint32_t height = texture_getheight(target);
|
||||
gs_texture_t texture = video->render_textures[prev_texture];
|
||||
gs_texture_t target = video->output_textures[cur_texture];
|
||||
uint32_t width = gs_texture_get_width(target);
|
||||
uint32_t height = gs_texture_get_height(target);
|
||||
|
||||
/* TODO: replace with actual downscalers or unpackers */
|
||||
effect_t effect = video->default_effect;
|
||||
technique_t tech = effect_gettechnique(effect, "DrawMatrix");
|
||||
eparam_t image = effect_getparambyname(effect, "image");
|
||||
eparam_t matrix = effect_getparambyname(effect, "color_matrix");
|
||||
gs_effect_t effect = video->default_effect;
|
||||
gs_technique_t tech = gs_effect_get_technique(effect, "DrawMatrix");
|
||||
gs_eparam_t image = gs_effect_get_param_by_name(effect, "image");
|
||||
gs_eparam_t matrix = gs_effect_get_param_by_name(effect,
|
||||
"color_matrix");
|
||||
size_t passes, i;
|
||||
|
||||
if (!video->textures_rendered[prev_texture])
|
||||
return;
|
||||
|
||||
gs_setrendertarget(target, NULL);
|
||||
gs_set_render_target(target, NULL);
|
||||
set_render_size(width, height);
|
||||
|
||||
/* TODO: replace with programmable code */
|
||||
@@ -140,38 +141,38 @@ static inline void render_output_texture(struct obs_core_video *video,
|
||||
0.000000f, 0.000000f, 0.000000f, 1.000000f
|
||||
};
|
||||
|
||||
effect_setval(matrix, mat_val, sizeof(mat_val));
|
||||
effect_settexture(image, texture);
|
||||
gs_effect_set_val(matrix, mat_val, sizeof(mat_val));
|
||||
gs_effect_set_texture(image, texture);
|
||||
|
||||
passes = technique_begin(tech);
|
||||
passes = gs_technique_begin(tech);
|
||||
for (i = 0; i < passes; i++) {
|
||||
technique_beginpass(tech, i);
|
||||
gs_technique_begin_pass(tech, i);
|
||||
gs_draw_sprite(texture, 0, width, height);
|
||||
technique_endpass(tech);
|
||||
gs_technique_end_pass(tech);
|
||||
}
|
||||
technique_end(tech);
|
||||
gs_technique_end(tech);
|
||||
|
||||
video->textures_output[cur_texture] = true;
|
||||
}
|
||||
|
||||
static inline void set_eparam(effect_t effect, const char *name, float val)
|
||||
static inline void set_eparam(gs_effect_t effect, const char *name, float val)
|
||||
{
|
||||
eparam_t param = effect_getparambyname(effect, name);
|
||||
effect_setfloat(param, val);
|
||||
gs_eparam_t param = gs_effect_get_param_by_name(effect, name);
|
||||
gs_effect_set_float(param, val);
|
||||
}
|
||||
|
||||
static void render_convert_texture(struct obs_core_video *video,
|
||||
int cur_texture, int prev_texture)
|
||||
{
|
||||
texture_t texture = video->output_textures[prev_texture];
|
||||
texture_t target = video->convert_textures[cur_texture];
|
||||
float fwidth = (float)video->output_width;
|
||||
float fheight = (float)video->output_height;
|
||||
size_t passes, i;
|
||||
gs_texture_t texture = video->output_textures[prev_texture];
|
||||
gs_texture_t target = video->convert_textures[cur_texture];
|
||||
float fwidth = (float)video->output_width;
|
||||
float fheight = (float)video->output_height;
|
||||
size_t passes, i;
|
||||
|
||||
effect_t effect = video->conversion_effect;
|
||||
eparam_t image = effect_getparambyname(effect, "image");
|
||||
technique_t tech = effect_gettechnique(effect,
|
||||
gs_effect_t effect = video->conversion_effect;
|
||||
gs_eparam_t image = gs_effect_get_param_by_name(effect, "image");
|
||||
gs_technique_t tech = gs_effect_get_technique(effect,
|
||||
video->conversion_tech);
|
||||
|
||||
if (!video->textures_output[prev_texture])
|
||||
@@ -189,19 +190,19 @@ static void render_convert_texture(struct obs_core_video *video,
|
||||
set_eparam(effect, "height_d2_i", 1.0f / (fheight * 0.5f));
|
||||
set_eparam(effect, "input_height", (float)video->conversion_height);
|
||||
|
||||
effect_settexture(image, texture);
|
||||
gs_effect_set_texture(image, texture);
|
||||
|
||||
gs_setrendertarget(target, NULL);
|
||||
gs_set_render_target(target, NULL);
|
||||
set_render_size(video->output_width, video->conversion_height);
|
||||
|
||||
passes = technique_begin(tech);
|
||||
passes = gs_technique_begin(tech);
|
||||
for (i = 0; i < passes; i++) {
|
||||
technique_beginpass(tech, i);
|
||||
gs_technique_begin_pass(tech, i);
|
||||
gs_draw_sprite(texture, 0, video->output_width,
|
||||
video->conversion_height);
|
||||
technique_endpass(tech);
|
||||
gs_technique_end_pass(tech);
|
||||
}
|
||||
technique_end(tech);
|
||||
gs_technique_end(tech);
|
||||
|
||||
video->textures_converted[cur_texture] = true;
|
||||
}
|
||||
@@ -209,9 +210,9 @@ static void render_convert_texture(struct obs_core_video *video,
|
||||
static inline void stage_output_texture(struct obs_core_video *video,
|
||||
int cur_texture, int prev_texture)
|
||||
{
|
||||
texture_t texture;
|
||||
gs_texture_t texture;
|
||||
bool texture_ready;
|
||||
stagesurf_t copy = video->copy_surfaces[cur_texture];
|
||||
gs_stagesurf_t copy = video->copy_surfaces[cur_texture];
|
||||
|
||||
if (video->gpu_conversion) {
|
||||
texture = video->convert_textures[prev_texture];
|
||||
@@ -234,10 +235,10 @@ static inline void stage_output_texture(struct obs_core_video *video,
|
||||
static inline void render_video(struct obs_core_video *video, int cur_texture,
|
||||
int prev_texture)
|
||||
{
|
||||
gs_beginscene();
|
||||
gs_begin_scene();
|
||||
|
||||
gs_enable_depthtest(false);
|
||||
gs_setcullmode(GS_NEITHER);
|
||||
gs_enable_depth_test(false);
|
||||
gs_set_cull_mode(GS_NEITHER);
|
||||
|
||||
render_main_texture(video, cur_texture);
|
||||
render_output_texture(video, cur_texture, prev_texture);
|
||||
@@ -246,21 +247,21 @@ static inline void render_video(struct obs_core_video *video, int cur_texture,
|
||||
|
||||
stage_output_texture(video, cur_texture, prev_texture);
|
||||
|
||||
gs_setrendertarget(NULL, NULL);
|
||||
gs_set_render_target(NULL, NULL);
|
||||
gs_enable_blending(true);
|
||||
|
||||
gs_endscene();
|
||||
gs_end_scene();
|
||||
}
|
||||
|
||||
static inline bool download_frame(struct obs_core_video *video,
|
||||
int prev_texture, struct video_data *frame)
|
||||
{
|
||||
stagesurf_t surface = video->copy_surfaces[prev_texture];
|
||||
gs_stagesurf_t surface = video->copy_surfaces[prev_texture];
|
||||
|
||||
if (!video->textures_copied[prev_texture])
|
||||
return false;
|
||||
|
||||
if (!stagesurface_map(surface, &frame->data[0], &frame->linesize[0]))
|
||||
if (!gs_stagesurface_map(surface, &frame->data[0], &frame->linesize[0]))
|
||||
return false;
|
||||
|
||||
video->mapped_surface = surface;
|
||||
@@ -413,12 +414,12 @@ static inline void output_frame(uint64_t timestamp)
|
||||
memset(&frame, 0, sizeof(struct video_data));
|
||||
frame.timestamp = timestamp;
|
||||
|
||||
gs_entercontext(video->graphics);
|
||||
gs_enter_context(video->graphics);
|
||||
|
||||
render_video(video, cur_texture, prev_texture);
|
||||
frame_ready = download_frame(video, prev_texture, &frame);
|
||||
|
||||
gs_leavecontext();
|
||||
gs_leave_context();
|
||||
|
||||
if (frame_ready)
|
||||
output_video_data(video, &frame, cur_texture);
|
||||
|
Reference in New Issue
Block a user