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

fix up the rest of the GL code, add glew to project, add makefiles for opengl, fix makefiles so that it can be built with gcc, update project files to automatically output to the build directory

Browse Source
This commit is contained in:
jp9000
2013-10-16 23:31:18 -07:00
parent 0dfc844abc
commit dfa2dc6eab
40 changed files with 937 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libobs/obs-video.c
View File

@@ -42,8 +42,6 @@ static inline void render_displays(void)
struct vec4 clear_color;
vec4_set(&clear_color, 0.3f, 0.0f, 0.0f, 1.0f);
//gs_enable_depthtest(false);
gs_ortho(0.0f, (float)obs->output_width,
0.0f, (float)obs->output_height,
-100.0f, 100.0f);
@@ -66,9 +64,13 @@ static inline void render_displays(void)
gs_load_swapchain(NULL);
gs_beginscene();
gs_clear(GS_CLEAR_COLOR|GS_CLEAR_DEPTH|GS_CLEAR_STENCIL,
gs_clear(GS_CLEAR_COLOR | GS_CLEAR_DEPTH | GS_CLEAR_STENCIL,
&clear_color, 1.0f, 0);
gs_enable_depthtest(false);
gs_enable_blending(false);
gs_setcullmode(GS_NEITHER);
gs_setviewport(0, 0, gs_getwidth(), gs_getheight());
if (obs->primary_source)
@@ -90,7 +92,7 @@ static bool swap_frame(uint64_t timestamp)
}
obs->textures_copied[obs->cur_texture] = true;
gs_stage_texture(last_surface, NULL);
//gs_stage_texture(last_surface, NULL);
if (++obs->cur_texture == NUM_TEXTURES)
obs->cur_texture = 0;