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

Remove 'rebuild' variable from vertexbuffer_flush

Browse Source 
This variable is currently somewhat pointless, I was originally going to
use it to tell the graphics subsystem to completely rebuild the internal
vertex buffers, but it would be bad/inefficient to allow that
functionality.
This commit is contained in:
jp9000 2014-06-25 01:16:09 -07:00
parent 28d52560ef
commit f4e7a893c5
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1668,7 +1668,7 @@ void vertexbuffer_destroy(vertbuffer_t vertbuffer)
delete vertbuffer;
}
void vertexbuffer_flush(vertbuffer_t vertbuffer, bool rebuild)
void vertexbuffer_flush(vertbuffer_t vertbuffer)
{
if (!vertbuffer->dynamic) {
blog(LOG_ERROR, "vertexbuffer_flush: vertex buffer is "

3
libobs-opengl/gl-vertexbuffer.c
View File

@ -120,7 +120,7 @@ void vertexbuffer_destroy(vertbuffer_t vb)
}
}
void vertexbuffer_flush(vertbuffer_t vb, bool rebuild)
void vertexbuffer_flush(vertbuffer_t vb)
{
size_t i;
@ -164,7 +164,6 @@ void vertexbuffer_flush(vertbuffer_t vb, bool rebuild)
goto failed;
}
UNUSED_PARAMETER(rebuild);
return;
failed:

2
libobs/graphics/graphics-internal.h
View File

@ -171,7 +171,7 @@ struct gs_exports {
void (*samplerstate_destroy)(samplerstate_t samplerstate);
void (*vertexbuffer_destroy)(vertbuffer_t vertbuffer);
void (*vertexbuffer_flush)(vertbuffer_t vertbuffer, bool rebuild);
void (*vertexbuffer_flush)(vertbuffer_t vertbuffer);
struct vb_data *(*vertexbuffer_getdata)(vertbuffer_t vertbuffer);
void (*indexbuffer_destroy)(indexbuffer_t indexbuffer);

8
libobs/graphics/graphics.c
View File

@ -420,7 +420,7 @@ void gs_renderstop(enum gs_draw_mode mode)
}
if (graphics->using_immediate) {
vertexbuffer_flush(graphics->immediate_vertbuffer, false);
vertexbuffer_flush(graphics->immediate_vertbuffer);
gs_load_vertexbuffer(graphics->immediate_vertbuffer);
gs_load_indexbuffer(NULL);
@ -796,7 +796,7 @@ void gs_draw_sprite(texture_t tex, uint32_t flip, uint32_t width,
else
build_sprite_norm(data, fcx, fcy, flip);
vertexbuffer_flush(graphics->sprite_buffer, false);
vertexbuffer_flush(graphics->sprite_buffer);
gs_load_vertexbuffer(graphics->sprite_buffer);
gs_load_indexbuffer(NULL);
@ -1879,11 +1879,11 @@ void vertexbuffer_destroy(vertbuffer_t vertbuffer)
graphics->exports.vertexbuffer_destroy(vertbuffer);
}
void vertexbuffer_flush(vertbuffer_t vertbuffer, bool rebuild)
void vertexbuffer_flush(vertbuffer_t vertbuffer)
{
if (!thread_graphics || !vertbuffer) return;
thread_graphics->exports.vertexbuffer_flush(vertbuffer, rebuild);
thread_graphics->exports.vertexbuffer_flush(vertbuffer);
}
struct vb_data *vertexbuffer_getdata(vertbuffer_t vertbuffer)

2
libobs/graphics/graphics.h
View File

@ -678,7 +678,7 @@ EXPORT void zstencil_destroy(zstencil_t zstencil);
EXPORT void samplerstate_destroy(samplerstate_t samplerstate);
EXPORT void vertexbuffer_destroy(vertbuffer_t vertbuffer);
EXPORT void vertexbuffer_flush(vertbuffer_t vertbuffer, bool rebuild);
EXPORT void vertexbuffer_flush(vertbuffer_t vertbuffer);
EXPORT struct vb_data *vertexbuffer_getdata(vertbuffer_t vertbuffer);
EXPORT void indexbuffer_destroy(indexbuffer_t indexbuffer);