From 62bb77a9b6a95d09a7bb48bc3afb6c78b2483f7a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 15 Apr 2020 15:12:11 +0100
Subject: [PATCH] Initialise indirect parameter values to 0

---
 .../driver/gl/wrappers/gl_draw_funcs.cpp      | 22 +++++++++----------
 renderdoc/driver/gl/wrappers/gl_emulated.cpp  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
index 23d89d472..8c4530a01 100644
--- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
@@ -484,7 +484,7 @@ bool WrappedOpenGL::Serialise_glDispatchComputeIndirect(SerialiserType &ser, GLi
 
     if(IsLoading(m_State))
     {
-      uint32_t groupSizes[3];
+      uint32_t groupSizes[3] = {};
       GL.glGetBufferSubData(eGL_DISPATCH_INDIRECT_BUFFER, (GLintptr)offset, sizeof(uint32_t) * 3,
                             groupSizes);
 
@@ -1191,7 +1191,7 @@ bool WrappedOpenGL::Serialise_glDrawArraysIndirect(SerialiserType &ser, GLenum m
 
     if(IsLoading(m_State))
     {
-      DrawArraysIndirectCommand params;
+      DrawArraysIndirectCommand params = {};
       GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, (GLintptr)offset, sizeof(params), &params);
 
       AddEvent();
@@ -1508,7 +1508,7 @@ bool WrappedOpenGL::Serialise_glDrawElementsIndirect(SerialiserType &ser, GLenum
 
     if(IsLoading(m_State))
     {
-      DrawElementsIndirectCommand params;
+      DrawElementsIndirectCommand params = {};
       GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, (GLintptr)offset, sizeof(params), &params);
 
       AddEvent();
@@ -2704,7 +2704,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawArraysIndirect(SerialiserType &ser, GLe
       {
         m_CurEventID++;
 
-        DrawArraysIndirectCommand params;
+        DrawArraysIndirectCommand params = {};
 
         GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, offs, sizeof(params), &params);
 
@@ -2792,7 +2792,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawArraysIndirect(SerialiserType &ser, GLe
 
         uint32_t drawidx = (m_LastEventID - baseEventID);
 
-        DrawArraysIndirectCommand params;
+        DrawArraysIndirectCommand params = {};
 
         GLintptr offs = (GLintptr)offset;
         if(stride != 0)
@@ -2928,7 +2928,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirect(SerialiserType &ser, G
       {
         m_CurEventID++;
 
-        DrawElementsIndirectCommand params;
+        DrawElementsIndirectCommand params = {};
 
         GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, offs, sizeof(params), &params);
 
@@ -3019,7 +3019,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirect(SerialiserType &ser, G
 
         uint32_t drawidx = (m_LastEventID - baseEventID);
 
-        DrawElementsIndirectCommand params;
+        DrawElementsIndirectCommand params = {};
 
         GLintptr offs = (GLintptr)offset;
         if(stride != 0)
@@ -3158,7 +3158,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawArraysIndirectCount(SerialiserType &ser
       {
         m_CurEventID++;
 
-        DrawArraysIndirectCommand params;
+        DrawArraysIndirectCommand params = {};
 
         GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, offs, sizeof(params), &params);
 
@@ -3246,7 +3246,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawArraysIndirectCount(SerialiserType &ser
 
         uint32_t drawidx = (m_LastEventID - baseEventID);
 
-        DrawArraysIndirectCommand params;
+        DrawArraysIndirectCommand params = {};
 
         GLintptr offs = (GLintptr)offset;
         if(stride != 0)
@@ -3391,7 +3391,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirectCount(SerialiserType &s
       {
         m_CurEventID++;
 
-        DrawElementsIndirectCommand params;
+        DrawElementsIndirectCommand params = {};
 
         GL.glGetBufferSubData(eGL_DRAW_INDIRECT_BUFFER, offs, sizeof(params), &params);
 
@@ -3482,7 +3482,7 @@ bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirectCount(SerialiserType &s
 
         uint32_t drawidx = (m_LastEventID - baseEventID);
 
-        DrawElementsIndirectCommand params;
+        DrawElementsIndirectCommand params = {};
 
         GLintptr offs = (GLintptr)offset;
         if(stride != 0)
diff --git a/renderdoc/driver/gl/wrappers/gl_emulated.cpp b/renderdoc/driver/gl/wrappers/gl_emulated.cpp
index 6dd2f4bbb..c07d8d211 100644
--- a/renderdoc/driver/gl/wrappers/gl_emulated.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_emulated.cpp
@@ -389,7 +389,7 @@ void APIENTRY _glGetNamedBufferSubDataEXT(GLuint buffer, GLintptr offset, GLsize
 void *APIENTRY _glMapNamedBufferEXT(GLuint buffer, GLenum access)
 {
   PushPopBuffer(eGL_COPY_READ_BUFFER, buffer);
-  GLint size;
+  GLint size = 0;
   GL.glGetBufferParameteriv(eGL_COPY_READ_BUFFER, eGL_BUFFER_SIZE, &size);
 
   GLbitfield accessBits = eGL_MAP_READ_BIT | eGL_MAP_WRITE_BIT;