Backups/SteamworksSDK
1
0
Fork 0
mirror of https://github.com/rlabrecque/SteamworksSDK.git synced 2026-10-10 09:33:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

v1.20

Browse Source
This commit is contained in:
Riley Labrecque
2014-01-29 13:52:02 +02:00
parent be51d31d42
commit 606bc833ce
73 changed files with 361 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glmgr/cglmprogram.cpp
+6 -6
View File
@@ -96,7 +96,7 @@ CGLMProgram::~CGLMProgram( )
GLMShaderDesc *glslDesc = &m_descs[kGLMGLSL];
if (glslDesc->m_object.glsl)
{
glDeleteShader( (uint)glslDesc->m_object.glsl ); // why do I need a cast here again ?
glDeleteShader( (uintptr_t)glslDesc->m_object.glsl ); // why do I need a cast here again ?
GLMCheckError();
glslDesc->m_object.glsl = 0;
}
@@ -516,7 +516,7 @@ struct GLMShaderLimitDesc
};
// macro to help make the table of what to check
#ifndef LMD( val, limit, flags )
#ifndef LMD
#define LMD( val, flags ) { GL_PROGRAM_##val##_ARB, GL_MAX_PROGRAM_##val##_ARB, #val, flags }
#else
#error you need to use a different name for this macro.
@@ -679,11 +679,11 @@ void CGLMProgram::LogSlow( EGLMProgramLang lang )
if (!desc->m_slowMark)
{
// log it
printf( "\n-------------- Slow %s ( CGLMProgram @ %08x, lang %s, name %d ) : \n%s \n",
printf( "\n-------------- Slow %s ( CGLMProgram @ %p, lang %s, name %d ) : \n%s \n",
m_type==kGLMVertexProgram ? "VS" : "FS",
this,
lang==kGLMGLSL ? "GLSL" : "ARB",
(int)(lang==kGLMGLSL ? (int)desc->m_object.glsl : (int)desc->m_object.arb),
(int)(uintptr_t)(lang==kGLMGLSL ? (uintptr_t)desc->m_object.glsl : (uintptr_t)desc->m_object.arb),
m_text
);
}
@@ -692,11 +692,11 @@ void CGLMProgram::LogSlow( EGLMProgramLang lang )
if ( (desc->m_slowMark & (desc->m_slowMark-1)) == 0 )
{
// short blurb
printf( "\n Slow %s ( CGLMProgram @ %08x, lang %s, name %d ) (%d times)",
printf( "\n Slow %s ( CGLMProgram @ %p, lang %s, name %d ) (%d times)",
m_type==kGLMVertexProgram ? "VS" : "FS",
this,
lang==kGLMGLSL ? "GLSL" : "ARB",
(int)(lang==kGLMGLSL ? (int)desc->m_object.glsl : (int)desc->m_object.arb),
(int)(lang==kGLMGLSL ? (uintptr_t)desc->m_object.glsl : (uintptr_t)desc->m_object.arb),
desc->m_slowMark+1
);
}
glmgr/dx9asmtogl2.cpp
+8 -8
View File
@@ -6,7 +6,7 @@
#include "DX9AsmToGL2.h"
void Error( char *fmt, ... )
void Error( const char *fmt, ... )
{
}
@@ -168,7 +168,7 @@ void GetParamNameWithoutSwizzle( const char *pParam, char *pOut, int nOutLen )
// The test against ')' here is for stuff like vec4( gl_Normal, 0.0 ) - we want to treat that as a whole param name.
if ( pDot )
{
int nToCopy = std::min( nOutLen-1, pDot - pParam );
int nToCopy = std::min<ptrdiff_t>( nOutLen-1, pDot - pParam );
memcpy( pOut, pParam, nToCopy );
pOut[nToCopy] = 0;
}
@@ -317,7 +317,7 @@ bool D3DToGL::OpenIntrinsic( uint32 inst, char* buff, int nBufLen, uint32 destDi
case D3DSIO_SLT:
if ( nArgumentDimension == 1 )
{
V_snprintf( buff, nBufLen, "float( ", nArgumentDimension ); // lessThan doesn't have a scalar version
V_snprintf( buff, nBufLen, "float( " ); // lessThan doesn't have a scalar version
}
else
{
@@ -328,7 +328,7 @@ bool D3DToGL::OpenIntrinsic( uint32 inst, char* buff, int nBufLen, uint32 destDi
case D3DSIO_SGE:
if ( nArgumentDimension == 1 )
{
V_snprintf( buff, nBufLen, "float( ", nArgumentDimension ); // greaterThanEqual doesn't have a scalar version
V_snprintf( buff, nBufLen, "float( " ); // greaterThanEqual doesn't have a scalar version
}
else
{
@@ -1133,7 +1133,7 @@ void D3DToGL::PrintParameterToString ( uint32 dwToken, uint32 dwSourceOrDest, ch
{
Assert( dwRegNum == 0 );
V_snprintf( buff, sizeof( buff ), "va_r", dwRegNum );
V_snprintf( buff, sizeof( buff ), "va_r" );
}
else
{
@@ -1204,11 +1204,11 @@ void D3DToGL::PrintParameterToString ( uint32 dwToken, uint32 dwSourceOrDest, ch
{
if ( dwRegNum == 0 )
{
V_snprintf( buff, sizeof( buff ), "gl_FrontColor", dwRegNum );
V_snprintf( buff, sizeof( buff ), "gl_FrontColor" );
}
else if ( dwRegNum == 1 )
{
V_snprintf( buff, sizeof( buff ), "gl_FrontSecondaryColor", dwRegNum );
V_snprintf( buff, sizeof( buff ), "gl_FrontSecondaryColor" );
}
else
{
@@ -1527,7 +1527,7 @@ void D3DToGL::AddTokenHexCodeToBuffer( char *pBuffer, int nSize, int nLastStrlen
char szHex[512];
szHex[0] = '\n';
V_snprintf( &szHex[1], sizeof( szHex )-1, HEXCODE_HEADER );
int nTokens = std::min( 10, m_pdwNextToken - m_pRecordedInputTokenStart );
int nTokens = std::min<ptrdiff_t>( 10, m_pdwNextToken - m_pRecordedInputTokenStart );
for ( int i=0; i < nTokens; i++ )
{
char szTemp[32];
glmgr/dx9asmtogl2.h
+1 -1
View File
@@ -102,7 +102,7 @@ private:
// Keep track of which temps are used so they can be declared
uint32 m_dwTempUsageMask;
bool m_bOutputColorRegister[2];
bool m_bOutputColorRegister[4];
bool m_bOutputDepthRegister;
// Declaration of integer and bool constants
glmgr/glmgr.cpp
+3 -3
View File
@@ -351,7 +351,7 @@ void GLMContext::DumpCaps( void )
#define dumpfield_hex( fff ) printf( "\n %-30s : 0x%08x", #fff, (int) m_caps.fff )
#define dumpfield_str( fff ) printf( "\n %-30s : %s", #fff, m_caps.fff )
printf("\n-------------------------------- context caps for context %08x", (uint)this);
printf("\n-------------------------------- context caps for context %p", this);
dumpfield( m_fullscreen );
dumpfield( m_accelerated );
@@ -3181,7 +3181,7 @@ void GLMContext::FlushDrawStates( bool shadersOn ) // shadersOn = true for draw
m_boundPairProgram = newPairProgram;
m_boundPairRevision = newPairRevision;
glUseProgram( (GLuint)newPairProgram );
glUseProgram( (uintptr_t)newPairProgram );
GLMCheckError();
// set the dirty levels appropriately since the program changed and has never seen any of the current values.
@@ -4881,7 +4881,7 @@ void GLMContext::DrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsiz
if (m_drawIndexBuffer->m_pseudo)
{
// you have to pass actual address, not offset... shhh... secret
indicesActual = (void*)((int)indicesActual + (int)m_drawIndexBuffer->m_pseudoBuf);
indicesActual = (void*)((uintptr_t)indicesActual + (uintptr_t)m_drawIndexBuffer->m_pseudoBuf);
}
#if GLMDEBUG
glmgr/glmgrbasics.cpp
+4 -4
View File
@@ -2705,9 +2705,9 @@ bool GLMDetectOGLP( void )
if (result)
{
// enable a breakpoint on color4sv
int oglp_bkpt[3] = { kCGLFEglColor4sv, kCGLProfBreakBefore, 1 };
GLint oglp_bkpt[3] = { kCGLFEglColor4sv, kCGLProfBreakBefore, 1 };
CGLSetOption( kCGLGOEnableBreakpoint, (GLint)oglp_bkpt );
CGLSetGlobalOption( kCGLGOEnableBreakpoint, oglp_bkpt );
}
return result;
@@ -2954,14 +2954,14 @@ void GLMEnableTrace( bool on )
void GLMStringOut( char *string )
{
if ( GLMDebugChannelMask() & ( (1<<ePrintf) || (1<<eDebugger) ) )
if ( GLMDebugChannelMask() & ( (1<<ePrintf) | (1<<eDebugger) ) )
{
puts( string );
}
if ( GLMDebugChannelMask() & (1<<eGLProfiler) )
{
CGLSetOption( kCGLGOComment, (GLint)string );
CGLSetGlobalOption( kCGLGOComment, (GLint*)string );
}
}
glmgr/glmgrbasics.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "imageformat.h"
#include "glmdebug.h"
#ifndef Assert(x)
#ifndef Assert
#define Assert(x)
#endif
glmgr/glmgrcocoa.mm
+2 -2
View File
@@ -446,7 +446,7 @@ void GLMDisplayInfo::PopulateModes( void )
void GLMDisplayInfo::Dump( int which )
{
GLMPRINTF(("\n #%d: GLMDisplayInfo @ %08x, cg-id=%08x display-mask=%08x pixwidth=%d pixheight=%d", which, (int)this, m_info.m_cgDisplayID, m_info.m_glDisplayMask, m_info.m_displayPixelWidth, m_info.m_displayPixelHeight ));
GLMPRINTF(("\n #%d: GLMDisplayInfo @ %08x, cg-id=%p display-mask=%08x pixwidth=%d pixheight=%d", which, this, m_info.m_cgDisplayID, m_info.m_glDisplayMask, m_info.m_displayPixelWidth, m_info.m_displayPixelHeight ));
int i=0;
for( std::vector< GLMDisplayMode * >::iterator p = m_modes->begin(); p != m_modes->end(); p++ )
@@ -983,7 +983,7 @@ void GLMDisplayDB::PopulateRenderers( void )
{
// grab the OS version
long vMajor = 0; long vMinor = 0; long vMinorMinor = 0;
SInt32 vMajor = 0; SInt32 vMinor = 0; SInt32 vMinorMinor = 0;
OSStatus gestalt_err = 0;
gestalt_err = Gestalt(gestaltSystemVersionMajor, &vMajor);
glmgr/glmgrext.cpp
-2
View File
@@ -5,8 +5,6 @@
//
//===============================================================================
#pragma once
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#include <mach-o/dyld.h>