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

change names, fix some bugs, minor GL/D3D fixes, update tests, fix effect files, output a little more debug information

Browse Source
This commit is contained in:
jp9000
2013-10-14 12:37:52 -07:00
parent 1493a325bb
commit 9570f0b8d7
36 changed files with 530 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libobs-d3d11/d3d11-exports.h
View File

@@ -23,6 +23,8 @@ extern "C" {
EXPORT device_t device_create(struct gs_init_data *data);
EXPORT void device_destroy(device_t device);
EXPORT void device_entercontext(device_t device);
EXPORT void device_leavecontext(device_t device);
EXPORT swapchain_t device_create_swapchain(device_t device,
struct gs_init_data *data);
EXPORT void device_resize(device_t device, uint32_t x, uint32_t y);

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

@@ -426,6 +426,16 @@ void device_destroy(device_t device)
delete device;
}
void device_entercontext(device_t device)
{
/* does nothing */
}
void device_leavecontext(device_t device)
{
/* does nothing */
}
swapchain_t device_create_swapchain(device_t device, struct gs_init_data *data)
{
gs_swap_chain *swap = NULL;
@@ -591,7 +601,7 @@ shader_t device_create_vertexshader(device_t device,
if (error_string)
*error_string = bstrdup(buf);
blog(LOG_ERROR, "device_create_vertexshader (D3D11): "
"Compile errors for %s:\n%s",
"Compile warnings/errors for %s:\n%s",
file, buf);
} catch (const char *error) {
@@ -620,7 +630,7 @@ shader_t device_create_pixelshader(device_t device,
if (error_string)
*error_string = bstrdup(buf);
blog(LOG_ERROR, "device_create_pixelshader (D3D11): "
"Compiler errors for %s:\n%s",
"Compiler warnings/errors for %s:\n%s",
file, buf);
} catch (const char *error) {