From f4e7a893c53f789290643a8b0da9a8e66124e677 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 25 Jun 2014 01:16:09 -0700
Subject: [PATCH] Remove 'rebuild' variable from vertexbuffer_flush
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.
---
libobs-d3d11/d3d11-subsystem.cpp | 2 +-
libobs-opengl/gl-vertexbuffer.c | 3 +--
libobs/graphics/graphics-internal.h | 2 +-
libobs/graphics/graphics.c | 8 ++++----
libobs/graphics/graphics.h | 2 +-
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp
index a4953c83e..39a1af6f3 100644
--- a/libobs-d3d11/d3d11-subsystem.cpp
+++ b/libobs-d3d11/d3d11-subsystem.cpp
@@ -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 "
diff --git a/libobs-opengl/gl-vertexbuffer.c b/libobs-opengl/gl-vertexbuffer.c
index bec21872a..becb74d01 100644
--- a/libobs-opengl/gl-vertexbuffer.c
+++ b/libobs-opengl/gl-vertexbuffer.c
@@ -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:
diff --git a/libobs/graphics/graphics-internal.h b/libobs/graphics/graphics-internal.h
index 4448392f6..9717d6555 100644
--- a/libobs/graphics/graphics-internal.h
+++ b/libobs/graphics/graphics-internal.h
@@ -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);
diff --git a/libobs/graphics/graphics.c b/libobs/graphics/graphics.c
index 9425360dc..28372667b 100644
--- a/libobs/graphics/graphics.c
+++ b/libobs/graphics/graphics.c
@@ -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)
diff --git a/libobs/graphics/graphics.h b/libobs/graphics/graphics.h
index f33b942c3..46adb1292 100644
--- a/libobs/graphics/graphics.h
+++ b/libobs/graphics/graphics.h
@@ -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);
--
GitLab