lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-24 00:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98 from valeriog-crytek/master

Browse Source 
Fixed some GL issues
This commit is contained in:
Baldur Karlsson
2014-10-15 14:55:43 +01:00
parent 87bcde1c4c e0450d7940
commit fda705af9a
9 changed files with 247 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.h
+1
View File
@@ -171,6 +171,7 @@ enum GLChunkType
DEPTH_FUNC,
DEPTH_MASK,
DEPTH_RANGE,
DEPTH_RANGEF,
DEPTH_RANGEARRAY,
DEPTH_BOUNDS,
PATCH_PARAMI,
renderdoc/driver/gl/gl_driver.cpp
+24 -4
View File
@@ -121,6 +121,7 @@ const char *GLChunkNames[] =
"glDepthFunc",
"glDepthMask",
"glDepthRange",
"glDepthRangef",
"glDepthRangeArrayv",
"glDepthBoundsEXT",
"glPatchParameteri",
@@ -582,14 +583,26 @@ void WrappedOpenGL::Present(void *windowHandle)
{
RDCGLenum prevReadBuf = eGL_BACK;
GLint prevBuf = 0;
GLint unpackBufBind = 0;
GLint packBufBind = 0;
GLint prevPackRowLen = 0;
GLint prevPackSkipRows = 0;
GLint prevPackSkipPixels = 0;
GLint prevPackAlignment = 0;
m_Real.glGetIntegerv(eGL_READ_BUFFER, (GLint *)&prevReadBuf);
m_Real.glGetIntegerv(eGL_READ_FRAMEBUFFER_BINDING, &prevBuf);
m_Real.glGetIntegerv(eGL_PIXEL_PACK_BUFFER_BINDING, &unpackBufBind);
m_Real.glGetIntegerv(eGL_PIXEL_PACK_BUFFER_BINDING, &packBufBind);
m_Real.glGetIntegerv(eGL_PACK_ROW_LENGTH, &prevPackRowLen);
m_Real.glGetIntegerv(eGL_PACK_SKIP_ROWS, &prevPackSkipRows);
m_Real.glGetIntegerv(eGL_PACK_SKIP_PIXELS, &prevPackSkipPixels);
m_Real.glGetIntegerv(eGL_PACK_ALIGNMENT, &prevPackAlignment);
m_Real.glReadBuffer(eGL_BACK);
m_Real.glBindFramebuffer(eGL_READ_FRAMEBUFFER, 0);
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glBindBuffer(eGL_PIXEL_PACK_BUFFER, 0);
m_Real.glPixelStorei(eGL_PACK_ROW_LENGTH, 0);
m_Real.glPixelStorei(eGL_PACK_SKIP_ROWS, 0);
m_Real.glPixelStorei(eGL_PACK_SKIP_PIXELS, 0);
m_Real.glPixelStorei(eGL_PACK_ALIGNMENT, 1);
thwidth = m_InitParams.width;
thheight = m_InitParams.height;
@@ -617,9 +630,13 @@ void WrappedOpenGL::Present(void *windowHandle)
}
}
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackBufBind);
m_Real.glBindBuffer(eGL_PIXEL_PACK_BUFFER, packBufBind);
m_Real.glBindFramebuffer(eGL_READ_FRAMEBUFFER, prevBuf);
m_Real.glReadBuffer(prevReadBuf);
m_Real.glPixelStorei(eGL_PACK_ROW_LENGTH, prevPackRowLen);
m_Real.glPixelStorei(eGL_PACK_SKIP_ROWS, prevPackSkipRows);
m_Real.glPixelStorei(eGL_PACK_SKIP_PIXELS, prevPackSkipPixels);
m_Real.glPixelStorei(eGL_PACK_ALIGNMENT, prevPackAlignment);
}
byte *jpgbuf = NULL;
@@ -1175,6 +1192,9 @@ void WrappedOpenGL::ProcessChunk(uint64_t offset, GLChunkType context)
case DEPTH_RANGE:
Serialise_glDepthRange(0, 0);
break;
case DEPTH_RANGEF:
Serialise_glDepthRangef(0, 0);
break;
case DEPTH_RANGEARRAY:
Serialise_glDepthRangeArrayv(0, 0, NULL);
break;
renderdoc/driver/gl/gl_manager.cpp
+5 -1
View File
@@ -132,7 +132,11 @@ bool GLResourceManager::Serialise_InitialState(GLResource res)
res = GLResource(MakeNullResource);
}
if(res.Namespace == eResVertexArray)
if(res.Namespace == eResBuffer)
{
// Nothing to serialize
}
else if(res.Namespace == eResVertexArray)
{
VertexArrayInitialData data[16];
renderdoc/driver/gl/gl_manager.h
-1
View File
@@ -37,7 +37,6 @@ class GLResourceManager : public ResourceManager<GLResource, GLResourceRecord>
GLResourceManager(LogState state, Serialiser *ser, WrappedOpenGL *gl)
: ResourceManager(state, ser), m_GL(gl), m_SyncName(1)
{
m_pSerialiser = NULL;
}
~GLResourceManager() {}
renderdoc/driver/gl/gl_replay.cpp
+1 -1
View File
@@ -468,7 +468,7 @@ FetchTexture GLReplay::GetTexture(ResourceId id)
else if(tex.format.special)
{
tex.byteSize += GetByteSize(RDCMAX(1U, tex.width>>m), RDCMAX(1U, tex.height>>m), RDCMAX(1U, tex.depth>>m),
(GLenum)fmt, (GLenum)fmt, 1);
GetBaseFormat((GLenum)fmt), GetDataType((GLenum)fmt), 1);
}
else
{
renderdoc/driver/gl/gl_resources.cpp
+193
View File
@@ -80,6 +80,7 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type,
case eGL_UNSIGNED_INT_8_8_8_8_REV:
case eGL_UNSIGNED_INT_10_10_10_2:
case eGL_UNSIGNED_INT_2_10_10_10_REV:
case eGL_UNSIGNED_INT_10F_11F_11F_REV:
return ((w*4 + alignAdd) & alignMask)*h*d;
case eGL_DEPTH_COMPONENT16:
return ((w*2 + alignAdd) & alignMask)*h*d;
@@ -87,8 +88,10 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type,
case eGL_DEPTH24_STENCIL8:
case eGL_DEPTH_COMPONENT32:
case eGL_DEPTH_COMPONENT32F:
case eGL_UNSIGNED_INT_24_8:
return ((w*4 + alignAdd) & alignMask)*h*d;
case eGL_DEPTH32F_STENCIL8:
case eGL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return ((w*5 + alignAdd) & alignMask)*h*d;
default:
RDCERR("Unhandled Byte Size type %d!", type);
@@ -126,3 +129,193 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type,
return 0;
}
GLenum GetBaseFormat(GLenum internalFormat)
{
switch(internalFormat)
{
case eGL_R8:
case eGL_R8_SNORM:
case eGL_R16:
case eGL_R16_SNORM:
case eGL_R16F:
case eGL_R8I:
case eGL_R8UI:
case eGL_R16I:
case eGL_R16UI:
case eGL_R32I:
case eGL_R32UI:
case eGL_R32F:
return eGL_RED;
case eGL_RG8:
case eGL_RG8_SNORM:
case eGL_RG16:
case eGL_RG16_SNORM:
case eGL_RG16F:
case eGL_RG32F:
case eGL_RG8I:
case eGL_RG8UI:
case eGL_RG16I:
case eGL_RG16UI:
case eGL_RG32I:
case eGL_RG32UI:
return eGL_RG;
case eGL_R3_G3_B2:
case eGL_RGB4:
case eGL_RGB5:
case eGL_RGB565:
case eGL_RGB8:
case eGL_RGB8_SNORM:
case eGL_RGB10:
case eGL_RGB12:
case eGL_RGB16:
case eGL_RGB16_SNORM:
case eGL_SRGB8:
case eGL_RGB16F:
case eGL_RGB32F:
case eGL_R11F_G11F_B10F:
case eGL_RGB9_E5:
case eGL_RGB8I:
case eGL_RGB8UI:
case eGL_RGB16I:
case eGL_RGB16UI:
case eGL_RGB32I:
case eGL_RGB32UI:
return eGL_RGB;
case eGL_RGBA2:
case eGL_RGBA4:
case eGL_RGB5_A1:
case eGL_RGBA8:
case eGL_RGBA8_SNORM:
case eGL_RGB10_A2:
case eGL_RGB10_A2UI:
case eGL_RGBA12:
case eGL_RGBA16:
case eGL_RGBA16_SNORM:
case eGL_SRGB8_ALPHA8:
case eGL_RGBA16F:
case eGL_RGBA32F:
case eGL_RGBA8I:
case eGL_RGBA8UI:
case eGL_RGBA16I:
case eGL_RGBA16UI:
case eGL_RGBA32UI:
case eGL_RGBA32I:
return eGL_RGBA;
case eGL_DEPTH_COMPONENT16:
case eGL_DEPTH_COMPONENT24:
case eGL_DEPTH_COMPONENT32:
case eGL_DEPTH_COMPONENT32F:
return eGL_DEPTH_COMPONENT;
case eGL_DEPTH24_STENCIL8:
case eGL_DEPTH32F_STENCIL8:
return eGL_DEPTH_STENCIL;
case eGL_STENCIL_INDEX1:
case eGL_STENCIL_INDEX4:
case eGL_STENCIL_INDEX8:
case eGL_STENCIL_INDEX16:
return eGL_STENCIL;
}
RDCERR("Unhandled Base Format case!");
return eGL_NONE;
}
GLenum GetDataType(GLenum internalFormat)
{
switch(internalFormat)
{
case eGL_RGBA8UI:
case eGL_RG8UI:
case eGL_R8UI:
case eGL_RGBA8:
case eGL_RG8:
case eGL_R8:
case eGL_RGB8:
case eGL_RGB8UI:
return eGL_UNSIGNED_BYTE;
case eGL_RGBA8I:
case eGL_RG8I:
case eGL_R8I:
case eGL_RGBA8_SNORM:
case eGL_RG8_SNORM:
case eGL_R8_SNORM:
case eGL_RGB8_SNORM:
case eGL_SRGB8:
case eGL_RGB8I:
case eGL_SRGB8_ALPHA8:
return eGL_BYTE;
case eGL_RGBA16UI:
case eGL_RG16UI:
case eGL_R16UI:
case eGL_RGBA16:
case eGL_RG16:
case eGL_R16:
case eGL_RGB16:
case eGL_RGB16UI:
case eGL_DEPTH_COMPONENT16:
return eGL_UNSIGNED_SHORT;
case eGL_RGBA16I:
case eGL_RG16I:
case eGL_R16I:
case eGL_RGBA16_SNORM:
case eGL_RG16_SNORM:
case eGL_R16_SNORM:
case eGL_RGB16_SNORM:
case eGL_RGB16I:
return eGL_SHORT;
case eGL_RGBA32UI:
case eGL_RG32UI:
case eGL_R32UI:
case eGL_RGB32UI:
case eGL_DEPTH_COMPONENT24:
case eGL_DEPTH_COMPONENT32:
return eGL_UNSIGNED_INT;
case eGL_RGBA32I:
case eGL_RG32I:
case eGL_R32I:
case eGL_RGB32I:
return eGL_INT;
case eGL_RGBA16F:
case eGL_RG16F:
case eGL_RGB16F:
case eGL_R16F:
return eGL_HALF_FLOAT;
case eGL_RGBA32F:
case eGL_RG32F:
case eGL_R32F:
case eGL_DEPTH_COMPONENT32F:
return eGL_FLOAT;
case eGL_R11F_G11F_B10F:
return eGL_UNSIGNED_INT_10F_11F_11F_REV;
case eGL_RGB10_A2UI:
return eGL_INT_2_10_10_10_REV;
case eGL_RGB10_A2:
return eGL_UNSIGNED_INT_2_10_10_10_REV;
case eGL_R3_G3_B2:
return eGL_UNSIGNED_BYTE_3_3_2;
case eGL_RGB4:
case eGL_RGBA4:
return eGL_UNSIGNED_SHORT_4_4_4_4;
case eGL_RGB5:
case eGL_RGB5_A1:
return eGL_UNSIGNED_SHORT_5_5_5_1;
case eGL_RGB565:
return eGL_UNSIGNED_SHORT_5_6_5;
case eGL_RGB10:
return eGL_UNSIGNED_INT_10_10_10_2;
case eGL_RGB9_E5:
return eGL_UNSIGNED_INT_5_9_9_9_REV;
case eGL_DEPTH24_STENCIL8:
return eGL_UNSIGNED_INT_24_8;
case eGL_DEPTH32F_STENCIL8:
return eGL_FLOAT_32_UNSIGNED_INT_24_8_REV;
case eGL_STENCIL_INDEX8:
return eGL_UNSIGNED_BYTE;
}
RDCERR("Unhandled Data Type case!");
return eGL_NONE;
}
renderdoc/driver/gl/gl_resources.h
+2
View File
@@ -30,6 +30,8 @@
#include "driver/gl/gl_common.h"
size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type, int align);
GLenum GetBaseFormat(GLenum internalFormat);
GLenum GetDataType(GLenum internalFormat);
enum GLNamespace
{
renderdoc/driver/gl/wrappers/gl_state_funcs.cpp
+20 -1
View File
@@ -506,9 +506,28 @@ void WrappedOpenGL::glDepthRange(GLdouble nearVal, GLdouble farVal)
}
}
bool WrappedOpenGL::Serialise_glDepthRangef(GLfloat nearVal, GLfloat farVal)
{
SERIALISE_ELEMENT(GLfloat, n, nearVal);
SERIALISE_ELEMENT(GLfloat, f, farVal);
if(m_State <= EXECUTING)
m_Real.glDepthRangef(n, f);
return true;
}
void WrappedOpenGL::glDepthRangef(GLfloat nearVal, GLfloat farVal)
{
glDepthRange(nearVal, farVal);
m_Real.glDepthRangef(nearVal, farVal);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(DEPTH_RANGEF);
Serialise_glDepthRangef(nearVal, farVal);
m_ContextRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
renderdoc/os/win32/win32_hook.cpp
+1
View File
@@ -118,6 +118,7 @@ struct CachedHookData
// for safety (and because we don't need to), ignore these modules
if(!_stricmp(modName, "kernel32.dll") ||
!_stricmp(modName, "powrprof.dll") ||
strstr(lowername, "msvcr") == lowername ||
strstr(lowername, "msvcp") == lowername)
return;