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

Initialize default_rect_effect only with OpenGL

Browse Source 
Instead of limiting this to an apple-specific define, just limit it to
OpenGL -- because this particular effect file cannot be used with
Direct3D.
This commit is contained in:
jp9000 2014-10-14 06:47:25 -07:00
parent 69fc9fb7fc
commit 76d538611a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libobs/obs.c
View File

@ -224,12 +224,12 @@ static int obs_init_graphics(struct obs_video_info *ovi)
NULL);
bfree(filename);
#ifdef __APPLE__
filename = find_libobs_data_file("default_rect.effect");
video->default_rect_effect = gs_effect_create_from_file(filename,
NULL);
bfree(filename);
#endif
if (gs_get_device_type() == GS_DEVICE_OPENGL) {
filename = find_libobs_data_file("default_rect.effect");
video->default_rect_effect = gs_effect_create_from_file(
filename, NULL);
bfree(filename);
}
filename = find_libobs_data_file("solid.effect");
video->solid_effect = gs_effect_create_from_file(filename,
@ -243,10 +243,10 @@ static int obs_init_graphics(struct obs_video_info *ovi)
if (!video->default_effect)
success = false;
#ifdef __APPLE__
if (!video->default_rect_effect)
success = false;
#endif
if (gs_get_device_type() == GS_DEVICE_OPENGL) {
if (!video->default_rect_effect)
success = false;
}
if (!video->solid_effect)
success = false;
if (!video->conversion_effect)