diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/public/shaderapi | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/public/shaderapi')
| -rw-r--r-- | mp/src/public/shaderapi/IShaderDevice.h | 1 | ||||
| -rw-r--r-- | mp/src/public/shaderapi/ishaderapi.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mp/src/public/shaderapi/IShaderDevice.h b/mp/src/public/shaderapi/IShaderDevice.h index 34749de0..832e6ac7 100644 --- a/mp/src/public/shaderapi/IShaderDevice.h +++ b/mp/src/public/shaderapi/IShaderDevice.h @@ -271,6 +271,7 @@ public: #ifdef DX_TO_GL_ABSTRACTION virtual void DoStartupShaderPreloading( void ) = 0; #endif + virtual char *GetDisplayDeviceName() = 0; }; diff --git a/mp/src/public/shaderapi/ishaderapi.h b/mp/src/public/shaderapi/ishaderapi.h index 69782a60..367cd0e9 100644 --- a/mp/src/public/shaderapi/ishaderapi.h +++ b/mp/src/public/shaderapi/ishaderapi.h @@ -603,7 +603,7 @@ public: // debug logging // only implemented in some subclasses virtual void PrintfVA( char *fmt, va_list vargs ) = 0; - virtual void Printf( PRINTF_FORMAT_STRING char *fmt, ... ) = 0; + virtual void Printf( PRINTF_FORMAT_STRING const char *fmt, ... ) = 0; virtual float Knob( char *knobname, float *setvalue = NULL ) = 0; // Allows us to override the alpha write setting of a material virtual void OverrideAlphaWriteEnable( bool bEnable, bool bAlphaWriteEnable ) = 0; |