ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(gl shader core) Simplifications

This commit is contained in:
twinaphex 2019-04-24 22:20:48 +02:00
parent 51a69dff44
commit e42dae928e
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gfx/drivers_shader/shader_gl_core.cpp
View File

@ -757,14 +757,14 @@ void Framebuffer::init()
void Framebuffer::clear() void Framebuffer::clear()
{ {
if (complete) if (!complete)
{ return;
glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT); glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glBindFramebuffer(GL_FRAMEBUFFER, 0); glClear(GL_COLOR_BUFFER_BIT);
} glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }
void Framebuffer::generate_mips() void Framebuffer::generate_mips()
@ -805,6 +805,7 @@ void Framebuffer::copy(const CommonResources &common, GLuint image)
void Framebuffer::copy_partial(const CommonResources &common, GLuint image, float rx, float ry) void Framebuffer::copy_partial(const CommonResources &common, GLuint image, float rx, float ry)
{ {
GLuint vbo;
if (!complete) if (!complete)
return; return;
@ -831,8 +832,7 @@ void Framebuffer::copy_partial(const CommonResources &common, GLuint image, floa
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
// A bit crude, but heeeey. /* A bit crude, but heeeey. */
GLuint vbo;
glGenBuffers(1, &vbo); glGenBuffers(1, &vbo);
glBindBuffer(GL_ARRAY_BUFFER, vbo); glBindBuffer(GL_ARRAY_BUFFER, vbo);
@ -870,27 +870,10 @@ class UBORing
{ {
public: public:
~UBORing(); ~UBORing();
void init(size_t size, unsigned count);
std::vector<GLuint> buffers; std::vector<GLuint> buffers;
unsigned buffer_index = 0; unsigned buffer_index = 0;
}; };
void UBORing::init(size_t size, unsigned count)
{
unsigned i;
buffers.resize(count);
glGenBuffers(count, buffers.data());
for (i = 0; i < buffers.size(); i++)
{
glBindBuffer(GL_UNIFORM_BUFFER, buffers[i]);
glBufferData(GL_UNIFORM_BUFFER, size, NULL, GL_STREAM_DRAW);
}
glBindBuffer(GL_UNIFORM_BUFFER, 0);
}
static void ubo_ring_update_and_bind( static void ubo_ring_update_and_bind(
unsigned vertex_binding, unsigned vertex_binding,
unsigned fragment_binding, unsigned fragment_binding,
@ -1224,7 +1207,22 @@ bool Pass::init_pipeline()
uniforms.resize(reflection.ubo_size); uniforms.resize(reflection.ubo_size);
if (reflection.ubo_size) if (reflection.ubo_size)
ubo_ring.init(reflection.ubo_size, 16); {
unsigned i;
size_t size = reflection.ubo_size;
unsigned count = 16;
ubo_ring.buffers.resize(count);
glGenBuffers(count, ubo_ring.buffers.data());
for (i = 0; i < ubo_ring.buffers.size(); i++)
{
glBindBuffer(GL_UNIFORM_BUFFER, ubo_ring.buffers[i]);
glBufferData(GL_UNIFORM_BUFFER, size, NULL, GL_STREAM_DRAW);
}
glBindBuffer(GL_UNIFORM_BUFFER, 0);
}
push_constant_buffer.resize(reflection.push_constant_size); push_constant_buffer.resize(reflection.push_constant_size);
reflect_parameter("MVP", reflection.semantics[SLANG_SEMANTIC_MVP]); reflect_parameter("MVP", reflection.semantics[SLANG_SEMANTIC_MVP]);