Просмотр исходного кода

gl_rasterizer: Fix nullptr dereference on disabled buffers

ReinUsesLisp 7 лет назад
Родитель
Сommit
f7691ebe57

+ 2 - 2
src/video_core/buffer_cache.h

@@ -162,6 +162,8 @@ public:
         return std::exchange(invalidated, false);
     }
 
+    virtual const BufferType* GetEmptyBuffer(std::size_t size) = 0;
+
 protected:
     void FlushObjectInner(const Buffer& entry) override {
         DownloadBufferData(entry->GetBuffer(), 0, entry->GetSize(), entry->GetWritableHostPtr());
@@ -171,8 +173,6 @@ protected:
 
     virtual const BufferType* ToHandle(const BufferStorageType& storage) = 0;
 
-    virtual const BufferType* GetEmptyBuffer(std::size_t size) = 0;
-
     virtual void UploadBufferData(const BufferStorageType& buffer, std::size_t offset,
                                   std::size_t size, const u8* data) = 0;
 

+ 2 - 2
src/video_core/renderer_opengl/gl_buffer_cache.h

@@ -27,13 +27,13 @@ public:
                             std::size_t stream_size);
     ~OGLBufferCache();
 
+    const GLuint* GetEmptyBuffer(std::size_t) override;
+
 protected:
     OGLBuffer CreateBuffer(std::size_t size) override;
 
     const GLuint* ToHandle(const OGLBuffer& buffer) override;
 
-    const GLuint* GetEmptyBuffer(std::size_t) override;
-
     void UploadBufferData(const OGLBuffer& buffer, std::size_t offset, std::size_t size,
                           const u8* data) override;
 

+ 1 - 1
src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -788,7 +788,7 @@ void RasterizerOpenGL::SetupConstBuffer(const Tegra::Engines::ConstBufferInfo& b
                                         const GLShader::ConstBufferEntry& entry) {
     if (!buffer.enabled) {
         // Set values to zero to unbind buffers
-        bind_ubo_pushbuffer.Push(0, 0, 0);
+        bind_ubo_pushbuffer.Push(buffer_cache.GetEmptyBuffer(sizeof(float)), 0, sizeof(float));
         return;
     }