obs-studio/plugins/linux-capture/xcompcap-main.cpp

586 lines
13 KiB
C++
Raw Normal View History

2014-04-28 17:59:53 -07:00
#include <glad/glad.h>
#include <glad/glad_glx.h>
#include <X11/Xlib.h>
#include <X11/extensions/Xcomposite.h>
#include <pthread.h>
#include <vector>
#include <obs-module.h>
#include <graphics/vec4.h>
#include <util/platform.h>
#include "xcompcap-main.hpp"
#include "xcompcap-helper.hpp"
#include "xcursor.h"
2014-04-28 17:59:53 -07:00
#define xdisp (XCompcap::disp())
#define WIN_STRING_DIV "\r\n"
bool XCompcapMain::init()
{
if (!xdisp) {
2014-04-28 17:59:53 -07:00
blog(LOG_ERROR, "failed opening display");
return false;
}
int eventBase, errorBase;
if (!XCompositeQueryExtension(xdisp, &eventBase, &errorBase)) {
2014-04-28 17:59:53 -07:00
blog(LOG_ERROR, "Xcomposite extension not supported");
return false;
}
int major = 0, minor = 2;
XCompositeQueryVersion(xdisp, &major, &minor);
if (major == 0 && minor < 2) {
blog(LOG_ERROR, "Xcomposite extension is too old: %d.%d < 0.2",
major, minor);
2014-04-28 17:59:53 -07:00
return false;
}
return true;
}
void XCompcapMain::deinit()
{
XCompcap::cleanupDisplay();
}
obs_properties_t *XCompcapMain::properties()
2014-04-28 17:59:53 -07:00
{
obs_properties_t *props = obs_properties_create();
2014-04-28 17:59:53 -07:00
obs_property_t *wins = obs_properties_add_list(props, "capture_window",
2014-07-09 22:12:57 -07:00
obs_module_text("Window"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
2014-04-28 17:59:53 -07:00
for (Window win: XCompcap::getTopLevelWindows()) {
2014-04-28 17:59:53 -07:00
std::string wname = XCompcap::getWindowName(win);
std::string cls = XCompcap::getWindowClass(win);
2014-04-28 17:59:53 -07:00
std::string winid = std::to_string((long long)win);
std::string desc =
(winid + WIN_STRING_DIV + wname +
WIN_STRING_DIV + cls);
obs_property_list_add_string(wins, wname.c_str(),
desc.c_str());
2014-04-28 17:59:53 -07:00
}
2014-07-09 22:12:57 -07:00
obs_properties_add_int(props, "cut_top", obs_module_text("CropTop"),
0, 4096, 1);
2014-07-09 22:12:57 -07:00
obs_properties_add_int(props, "cut_left", obs_module_text("CropLeft"),
0, 4096, 1);
2014-07-09 22:12:57 -07:00
obs_properties_add_int(props, "cut_right", obs_module_text("CropRight"),
0, 4096, 1);
2014-07-09 22:12:57 -07:00
obs_properties_add_int(props, "cut_bot", obs_module_text("CropBottom"),
0, 4096, 1);
2014-04-28 17:59:53 -07:00
2014-07-09 22:12:57 -07:00
obs_properties_add_bool(props, "swap_redblue",
obs_module_text("SwapRedBlue"));
obs_properties_add_bool(props, "lock_x", obs_module_text("LockX"));
2014-04-28 17:59:53 -07:00
obs_properties_add_bool(props, "show_cursor",
obs_module_text("CaptureCursor"));
obs_properties_add_bool(props, "include_border",
obs_module_text("IncludeXBorder"));
obs_properties_add_bool(props, "exclude_alpha",
obs_module_text("ExcludeAlpha"));
2014-04-28 17:59:53 -07:00
return props;
}
void XCompcapMain::defaults(obs_data_t *settings)
2014-04-28 17:59:53 -07:00
{
obs_data_set_default_string(settings, "capture_window", "");
obs_data_set_default_int(settings, "cut_top", 0);
obs_data_set_default_int(settings, "cut_left", 0);
obs_data_set_default_int(settings, "cut_right", 0);
obs_data_set_default_int(settings, "cut_bot", 0);
obs_data_set_default_bool(settings, "swap_redblue", false);
obs_data_set_default_bool(settings, "lock_x", false);
obs_data_set_default_bool(settings, "show_cursor", true);
obs_data_set_default_bool(settings, "include_border", false);
obs_data_set_default_bool(settings, "exclude_alpha", false);
2014-04-28 17:59:53 -07:00
}
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
#define FIND_WINDOW_INTERVAL 2.0
2014-04-28 17:59:53 -07:00
struct XCompcapMain_private
{
XCompcapMain_private()
:win(0)
,cut_top(0), cur_cut_top(0)
,cut_left(0), cur_cut_left(0)
,cut_right(0), cur_cut_right(0)
,cut_bot(0), cur_cut_bot(0)
2014-04-28 17:59:53 -07:00
,inverted(false)
,width(0),height(0)
,pixmap(0)
,glxpixmap(0)
,tex(0)
,gltex(0)
{
pthread_mutexattr_init(&lockattr);
pthread_mutexattr_settype(&lockattr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&lock, &lockattr);
}
~XCompcapMain_private()
{
pthread_mutex_destroy(&lock);
pthread_mutexattr_destroy(&lockattr);
}
obs_source_t *source;
2014-04-28 17:59:53 -07:00
std::string windowName;
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
Window win = 0;
2014-04-28 17:59:53 -07:00
int cut_top, cur_cut_top;
int cut_left, cur_cut_left;
int cut_right, cur_cut_right;
int cut_bot, cur_cut_bot;
bool inverted;
bool swapRedBlue;
bool lockX;
bool include_border;
bool exclude_alpha;
2014-04-28 17:59:53 -07:00
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
double window_check_time = 0.0;
2014-04-28 17:59:53 -07:00
uint32_t width;
uint32_t height;
uint32_t border;
2014-04-28 17:59:53 -07:00
Pixmap pixmap;
GLXPixmap glxpixmap;
gs_texture_t *tex;
gs_texture_t *gltex;
2014-04-28 17:59:53 -07:00
pthread_mutex_t lock;
pthread_mutexattr_t lockattr;
bool show_cursor = true;
bool cursor_outside = false;
xcursor_t *cursor = nullptr;
2014-04-28 17:59:53 -07:00
};
XCompcapMain::XCompcapMain(obs_data_t *settings, obs_source_t *source)
2014-04-28 17:59:53 -07:00
{
p = new XCompcapMain_private;
p->source = source;
obs_enter_graphics();
p->cursor = xcursor_init(xdisp);
obs_leave_graphics();
2014-04-28 17:59:53 -07:00
updateSettings(settings);
}
static void xcc_cleanup(XCompcapMain_private *p);
XCompcapMain::~XCompcapMain()
{
ObsGsContextHolder obsctx;
if (p->tex) {
(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
2014-08-07 23:42:07 -07:00
gs_texture_destroy(p->tex);
2014-04-28 17:59:53 -07:00
p->tex = 0;
}
xcc_cleanup(p);
if (p->cursor) {
xcursor_destroy(p->cursor);
p->cursor = nullptr;
}
2014-04-28 17:59:53 -07:00
delete p;
}
static Window getWindowFromString(std::string wstr)
{
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
XErrorLock xlock;
if (wstr == "") {
2014-04-28 17:59:53 -07:00
return XCompcap::getTopLevelWindows().front();
}
if (wstr.substr(0, 4) == "root") {
2014-04-28 17:59:53 -07:00
int i = std::stoi("0" + wstr.substr(4));
return RootWindow(xdisp, i);
}
size_t firstMark = wstr.find(WIN_STRING_DIV);
size_t markSize = strlen(WIN_STRING_DIV);
2014-04-28 17:59:53 -07:00
if (firstMark == std::string::npos)
2014-04-28 17:59:53 -07:00
return (Window)std::stol(wstr);
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
Window wid = 0;
2014-04-28 17:59:53 -07:00
wstr = wstr.substr(firstMark + markSize);
2014-04-28 17:59:53 -07:00
size_t lastMark = wstr.rfind(WIN_STRING_DIV);
std::string wname = wstr.substr(0, lastMark);
std::string wcls = wstr.substr(lastMark + markSize);
2014-04-28 17:59:53 -07:00
Window matchedNameWin = wid;
for (Window cwin: XCompcap::getTopLevelWindows()) {
2014-04-28 17:59:53 -07:00
std::string cwinname = XCompcap::getWindowName(cwin);
std::string ccls = XCompcap::getWindowClass(cwin);
2014-04-28 17:59:53 -07:00
if (cwin == wid && wname == cwinname && wcls == ccls)
2014-04-28 17:59:53 -07:00
return wid;
if (wname == cwinname ||
(!matchedNameWin && !wcls.empty() && wcls == ccls))
2014-04-28 17:59:53 -07:00
matchedNameWin = cwin;
}
return matchedNameWin;
}
static void xcc_cleanup(XCompcapMain_private *p)
{
PLock lock(&p->lock);
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
XDisplayLock xlock;
if (p->gltex) {
(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
2014-08-07 23:42:07 -07:00
gs_texture_destroy(p->gltex);
2014-04-28 17:59:53 -07:00
p->gltex = 0;
}
if (p->glxpixmap) {
2014-04-28 17:59:53 -07:00
glXDestroyPixmap(xdisp, p->glxpixmap);
p->glxpixmap = 0;
}
if (p->pixmap) {
2014-04-28 17:59:53 -07:00
XFreePixmap(xdisp, p->pixmap);
p->pixmap = 0;
}
if (p->win) {
XCompositeUnredirectWindow(xdisp, p->win,
CompositeRedirectAutomatic);
2014-04-28 17:59:53 -07:00
XSelectInput(xdisp, p->win, 0);
p->win = 0;
}
}
void XCompcapMain::updateSettings(obs_data_t *settings)
2014-04-28 17:59:53 -07:00
{
PLock lock(&p->lock);
XErrorLock xlock;
ObsGsContextHolder obsctx;
blog(LOG_DEBUG, "Settings updating");
Window prevWin = p->win;
xcc_cleanup(p);
if (settings) {
const char *windowName = obs_data_get_string(settings,
"capture_window");
p->windowName = windowName;
p->win = getWindowFromString(windowName);
2014-04-28 17:59:53 -07:00
p->cut_top = obs_data_get_int(settings, "cut_top");
p->cut_left = obs_data_get_int(settings, "cut_left");
p->cut_right = obs_data_get_int(settings, "cut_right");
p->cut_bot = obs_data_get_int(settings, "cut_bot");
p->lockX = obs_data_get_bool(settings, "lock_x");
p->swapRedBlue = obs_data_get_bool(settings, "swap_redblue");
p->show_cursor = obs_data_get_bool(settings, "show_cursor");
p->include_border = obs_data_get_bool(settings, "include_border");
p->exclude_alpha = obs_data_get_bool(settings, "exclude_alpha");
} else {
2014-04-28 17:59:53 -07:00
p->win = prevWin;
}
xlock.resetError();
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (p->win)
XCompositeRedirectWindow(xdisp, p->win,
CompositeRedirectAutomatic);
2014-04-28 17:59:53 -07:00
if (xlock.gotError()) {
blog(LOG_ERROR, "XCompositeRedirectWindow failed: %s",
xlock.getErrorText().c_str());
2014-04-28 17:59:53 -07:00
return;
}
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (p->win)
XSelectInput(xdisp, p->win, StructureNotifyMask | ExposureMask);
2014-04-28 17:59:53 -07:00
XSync(xdisp, 0);
XWindowAttributes attr;
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (!p->win || !XGetWindowAttributes(xdisp, p->win, &attr)) {
2014-04-28 17:59:53 -07:00
p->win = 0;
p->width = 0;
p->height = 0;
return;
}
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (p->win && p->cursor && p->show_cursor) {
Window child;
int x, y;
XTranslateCoordinates(xdisp, p->win, attr.root, 0, 0, &x, &y,
&child);
xcursor_offset(p->cursor, x, y);
}
2014-04-28 17:59:53 -07:00
gs_color_format cf = GS_RGBA;
if (p->exclude_alpha) {
cf = GS_BGRX;
}
p->border = attr.border_width;
if (p->include_border) {
p->width = attr.width + p->border * 2;
p->height = attr.height + p->border * 2;
} else {
p->width = attr.width;
p->height = attr.height;
}
2014-04-28 17:59:53 -07:00
if (p->cut_top + p->cut_bot < (int)p->height) {
2014-04-28 17:59:53 -07:00
p->cur_cut_top = p->cut_top;
p->cur_cut_bot = p->cut_bot;
} else {
2014-04-28 17:59:53 -07:00
p->cur_cut_top = 0;
p->cur_cut_bot = 0;
}
if (p->cut_left + p->cut_right < (int)p->width) {
2014-04-28 17:59:53 -07:00
p->cur_cut_left = p->cut_left;
p->cur_cut_right = p->cut_right;
} else {
2014-04-28 17:59:53 -07:00
p->cur_cut_left = 0;
p->cur_cut_right = 0;
}
if (p->tex)
(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
2014-08-07 23:42:07 -07:00
gs_texture_destroy(p->tex);
2014-04-28 17:59:53 -07:00
uint8_t *texData = new uint8_t[width() * height() * 4];
memset(texData, 0, width() * height() * 4);
2014-04-28 17:59:53 -07:00
const uint8_t* texDataArr[] = { texData, 0 };
(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
2014-08-07 23:42:07 -07:00
p->tex = gs_texture_create(width(), height(), cf, 1,
texDataArr, 0);
2014-04-28 17:59:53 -07:00
delete[] texData;
2014-07-09 16:13:51 -07:00
if (p->swapRedBlue) {
(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
2014-08-07 23:42:07 -07:00
GLuint tex = *(GLuint*)gs_texture_get_obj(p->tex);
2014-04-28 17:59:53 -07:00
glBindTexture(GL_TEXTURE_2D, tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
glBindTexture(GL_TEXTURE_2D, 0);
}
const int attrs[] =
{
GLX_BIND_TO_TEXTURE_RGBA_EXT, GL_TRUE,
GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT,
GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
GLX_DOUBLEBUFFER, GL_FALSE,
None
};
int nelem = 0;
GLXFBConfig* configs = glXChooseFBConfig(xdisp,
XCompcap::getRootWindowScreen(attr.root),
attrs, &nelem);
2014-04-28 17:59:53 -07:00
if (nelem <= 0) {
2014-04-28 17:59:53 -07:00
blog(LOG_ERROR, "no matching fb config found");
p->win = 0;
p->height = 0;
p->width = 0;
return;
}
glXGetFBConfigAttrib(xdisp, configs[0], GLX_Y_INVERTED_EXT, &nelem);
p->inverted = nelem != 0;
xlock.resetError();
p->pixmap = XCompositeNameWindowPixmap(xdisp, p->win);
if (xlock.gotError()) {
blog(LOG_ERROR, "XCompositeNameWindowPixmap failed: %s",
xlock.getErrorText().c_str());
2014-04-28 17:59:53 -07:00
p->pixmap = 0;
XFree(configs);
return;
}
const int attribs[] =
{
GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGBA_EXT,
None
};
2014-04-28 17:59:53 -07:00
p->glxpixmap = glXCreatePixmap(xdisp, configs[0], p->pixmap, attribs);
if (xlock.gotError()) {
blog(LOG_ERROR, "glXCreatePixmap failed: %s",
xlock.getErrorText().c_str());
2014-04-28 17:59:53 -07:00
XFreePixmap(xdisp, p->pixmap);
XFree(configs);
p->pixmap = 0;
p->glxpixmap = 0;
return;
}
XFree(configs);
(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
2014-08-07 23:42:07 -07:00
p->gltex = gs_texture_create(p->width, p->height, cf, 1, 0,
GS_GL_DUMMYTEX);
2014-04-28 17:59:53 -07:00
(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
2014-08-07 23:42:07 -07:00
GLuint gltex = *(GLuint*)gs_texture_get_obj(p->gltex);
2014-04-28 17:59:53 -07:00
glBindTexture(GL_TEXTURE_2D, gltex);
glXBindTexImageEXT(xdisp, p->glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
void XCompcapMain::tick(float seconds)
{
if (!obs_source_showing(p->source))
return;
2014-04-28 17:59:53 -07:00
PLock lock(&p->lock, true);
if (!lock.isLocked())
2014-04-28 17:59:53 -07:00
return;
XCompcap::processEvents();
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (p->win && XCompcap::windowWasReconfigured(p->win)) {
p->window_check_time = FIND_WINDOW_INTERVAL;
p->win = 0;
}
2014-04-28 17:59:53 -07:00
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
XDisplayLock xlock;
XWindowAttributes attr;
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (!p->win || !XGetWindowAttributes(xdisp, p->win, &attr)) {
p->window_check_time += (double)seconds;
if (p->window_check_time < FIND_WINDOW_INTERVAL)
return;
Window newWin = getWindowFromString(p->windowName);
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
p->window_check_time = 0.0;
if (newWin && XGetWindowAttributes(xdisp, newWin, &attr)) {
p->win = newWin;
updateSettings(0);
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
} else {
return;
}
}
if (!p->tex || !p->gltex)
2014-04-28 17:59:53 -07:00
return;
obs_enter_graphics();
2014-04-28 17:59:53 -07:00
if (p->lockX) {
2014-04-28 17:59:53 -07:00
XLockDisplay(xdisp);
XSync(xdisp, 0);
}
if (p->include_border) {
gs_copy_texture_region(
p->tex, 0, 0,
p->gltex,
p->cur_cut_left,
p->cur_cut_top,
width(), height());
} else {
gs_copy_texture_region(
p->tex, 0, 0,
p->gltex,
p->cur_cut_left + p->border,
p->cur_cut_top + p->border,
width(), height());
}
2014-04-28 17:59:53 -07:00
if (p->cursor && p->show_cursor) {
xcursor_tick(p->cursor);
p->cursor_outside =
p->cursor->x < p->cur_cut_left ||
p->cursor->y < p->cur_cut_top ||
p->cursor->x > int(p->width - p->cur_cut_right) ||
p->cursor->y > int(p->height - p->cur_cut_bot);
}
if (p->lockX)
2014-04-28 17:59:53 -07:00
XUnlockDisplay(xdisp);
obs_leave_graphics();
2014-04-28 17:59:53 -07:00
}
void XCompcapMain::render(gs_effect_t *effect)
2014-04-28 17:59:53 -07:00
{
if (!p->win)
return;
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
PLock lock(&p->lock, true);
effect = obs_get_base_effect(OBS_EFFECT_OPAQUE);
2014-04-28 17:59:53 -07:00
if (!lock.isLocked() || !p->tex)
2014-04-28 17:59:53 -07:00
return;
gs_eparam_t *image = gs_effect_get_param_by_name(effect, "image");
(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
2014-08-07 23:42:07 -07:00
gs_effect_set_texture(image, p->tex);
2014-04-28 17:59:53 -07:00
while (gs_effect_loop(effect, "Draw")) {
gs_draw_sprite(p->tex, 0, 0, 0);
}
if (p->cursor && p->gltex && p->show_cursor && !p->cursor_outside) {
effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
while (gs_effect_loop(effect, "Draw")) {
xcursor_render(p->cursor);
}
}
2014-04-28 17:59:53 -07:00
}
uint32_t XCompcapMain::width()
{
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (!p->win)
return 0;
2014-04-28 17:59:53 -07:00
return p->width - p->cur_cut_left - p->cur_cut_right;
}
uint32_t XCompcapMain::height()
{
linux-capture: Fix window capture crashes The xcomposite window capture crashes were due to a few factors: ------------------------------- 1.) The source's X error handler was possibly being overwritten by another part of the program despite us locking the display, presumably something in Qt which isn't locking the display when pushing/popping its own error handler (though this is not yet certain). The source's calls to X functions happen in the graphics thread, which is separate from the UI thread, and it was noticed that somehow the error handler would be overwritten almost seemingly at random, indicating that something else in the program outside of OBS code was not locking the display while pushing/popping the error handler. To replicate this, make it so that the source cannot find the target window and so it continually searches for it each video_tick call, then resize the main OBS window continually (which causes Qt to push/pop its own error handlers). A crash will almost always occur due to BadWindow despite our error handling. 2.) Calling X functions with a window ID that no longer exists, particularly XGetWindowAttributes, in conjunction the unknown error handler set in case #1 would cause the program to outright crash because that error handler is programmed to crash on BadWindow for whatever reason. The source would call X functions without even checking if 'win' was 0. 3.) The source stored window IDs (in JSON, even if they've long since become invalid/pointless, such as system restarts). This is a bad practice and will result in more cases of BadWindow. Fixing the problem (reducing the possibility of getting BadWindow): ------------------------------- Step 1.) Deprecate and ignore window IDs in stored settings. Instead of using window IDs to find the window, we now must always search the windows and find the target window via the window name exclusively. This helps ensure that we actually consistently have a working window ID. Step 2.) Do not call any X functions if the window ID is 0. Step 3.) Reset the window ID to 0 any time the window has updated, and make the source find the window again to ensure it still exists before attempting to use any X functions on the window ID again.
2016-06-04 14:20:41 -07:00
if (!p->win)
return 0;
2014-04-28 17:59:53 -07:00
return p->height - p->cur_cut_bot - p->cur_cut_top;
}