Nikilite/suyu
1
1
Fork 0
forked from suyu/suyu
Code Pull requests Activity

gl_resource_manager: Ensure non EXT_framebuffer objects are created

Browse source
This commit is contained in:
ameerj 2021-10-24 22:52:43 -04:00 committed by Fernando Sahmkow
parent 099b0b3167
commit 9fc1fa1b0d
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/video_core/renderer_opengl/gl_resource_manager.cpp
View file

@ -166,7 +166,12 @@ void OGLFramebuffer::Create() {
return; return;
MICROPROFILE_SCOPE(OpenGL_ResourceCreation); MICROPROFILE_SCOPE(OpenGL_ResourceCreation);
glCreateFramebuffers(1, &handle); // Bind to READ_FRAMEBUFFER to stop Nvidia's driver from creating an EXT_framebuffer instead of
// a core framebuffer. EXT framebuffer attachments have to match in size and can be shared
// across contexts. yuzu doesn't share framebuffers across contexts and we need attachments with
// mismatching size, this is why core framebuffers are preferred.
glGenFramebuffers(1, &handle);
glBindFramebuffer(GL_READ_FRAMEBUFFER, handle);
} }
void OGLFramebuffer::Release() { void OGLFramebuffer::Release() {

14
src/video_core/renderer_opengl/gl_texture_cache.cpp
View file

@ -478,10 +478,6 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, ProgramManager&
for (size_t i = 0; i < rescale_draw_fbos.size(); ++i) { for (size_t i = 0; i < rescale_draw_fbos.size(); ++i) {
rescale_draw_fbos[i].Create(); rescale_draw_fbos[i].Create();
rescale_read_fbos[i].Create(); rescale_read_fbos[i].Create();
// Make sure the framebuffer is created without DSA
glBindFramebuffer(GL_READ_FRAMEBUFFER, rescale_draw_fbos[i].handle);
glBindFramebuffer(GL_READ_FRAMEBUFFER, rescale_read_fbos[i].handle);
} }
} }
} }
@ -1224,13 +1220,8 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const TSCEntry& config) {
Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM_RT> color_buffers, Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM_RT> color_buffers,
ImageView* depth_buffer, const VideoCommon::RenderTargets& key) { ImageView* depth_buffer, const VideoCommon::RenderTargets& key) {
// Bind to READ_FRAMEBUFFER to stop Nvidia's driver from creating an EXT_framebuffer instead of framebuffer.Create();
// a core framebuffer. EXT framebuffer attachments have to match in size and can be shared GLuint handle = framebuffer.handle;
// across contexts. yuzu doesn't share framebuffers across contexts and we need attachments with
// mismatching size, this is why core framebuffers are preferred.
GLuint handle;
glGenFramebuffers(1, &handle);
glBindFramebuffer(GL_READ_FRAMEBUFFER, handle);
GLsizei num_buffers = 0; GLsizei num_buffers = 0;
std::array<GLenum, NUM_RT> gl_draw_buffers; std::array<GLenum, NUM_RT> gl_draw_buffers;
@ -1278,7 +1269,6 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM
const std::string name = VideoCommon::Name(key); const std::string name = VideoCommon::Name(key);
glObjectLabel(GL_FRAMEBUFFER, handle, static_cast<GLsizei>(name.size()), name.data()); glObjectLabel(GL_FRAMEBUFFER, handle, static_cast<GLsizei>(name.size()), name.data());
} }
framebuffer.handle = handle;
} }
void BGRCopyPass::CopyBGR(Image& dst_image, Image& src_image, void BGRCopyPass::CopyBGR(Image& dst_image, Image& src_image,