From 7d46b21fd6c21b001eb2f2a4e3654b5f834bb599 Mon Sep 17 00:00:00 2001 From: Janos Pantos Date: Fri, 28 Jul 2017 19:13:06 +0200 Subject: [PATCH] Fix binary compatibility issue caused by 310ada8 Move the new multi-view chunk types to the end of GLChunkType enum. --- renderdoc/driver/gl/gl_common.h | 5 +++-- renderdoc/driver/gl/gl_driver.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h index 5034dabca..819745207 100644 --- a/renderdoc/driver/gl/gl_common.h +++ b/renderdoc/driver/gl/gl_common.h @@ -668,8 +668,6 @@ enum GLChunkType FRAMEBUFFER_TEX3D, FRAMEBUFFER_RENDBUF, FRAMEBUFFER_TEXLAYER, - FRAMEBUFFER_MULTIVIEW, - FRAMEBUFFER_MULTIVIEWMS, FRAMEBUFFER_PARAM, READ_BUFFER, BIND_FRAMEBUFFER, @@ -743,5 +741,8 @@ enum GLChunkType FRAMEBUFFER_TEX2DMS, + FRAMEBUFFER_MULTIVIEW, + FRAMEBUFFER_MULTIVIEWMS, + NUM_OPENGL_CHUNKS, }; diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 3d2c5de0b..3254e9f4e 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -252,8 +252,6 @@ const char *GLChunkNames[] = { "glFramebufferTexture3D", "glFramebufferRenderbuffer", "glFramebufferTextureLayer", - "glFramebufferTextureMultiviewOVR", - "glFramebufferTextureMultisampleMultiviewOVR", "glFramebufferParameteri", "glReadBuffer", "glBindFramebuffer", @@ -326,6 +324,9 @@ const char *GLChunkNames[] = { "glPrimitiveBoundingBox", "glFramebufferTexture2DMultisample", + + "glFramebufferTextureMultiviewOVR", + "glFramebufferTextureMultisampleMultiviewOVR", }; GLInitParams::GLInitParams()