actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[default -> sm130futures] Bring in GLEW.

Browse Source
This commit is contained in:
Jason Felds
2011-05-04 17:08:57 -04:00
parent 279194713d 1aef2c25d4
commit 9c1084b63e
6 changed files with 96 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDataUtil.cpp
+1 -1
View File
@@ -367,7 +367,7 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
{ {
if( m ) if( m )
sRet.append( 1, ',' ); sRet.append( 1, ',' );
sRet += ssprintf(" // measure %d\n", m+1); sRet += ssprintf(" // measure %d\n", m);
NoteType nt = GetSmallestNoteTypeForMeasure( *nd, m ); NoteType nt = GetSmallestNoteTypeForMeasure( *nd, m );
int iRowSpacing; int iRowSpacing;
src/RageDisplay_OGL.cpp
+7 -1
View File
@@ -22,6 +22,10 @@ using namespace RageDisplay_Legacy_Helpers;
#include <set> #include <set>
#if defined(WINDOWS)
#include <GL/wglew.h>
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma comment(lib, "opengl32.lib") #pragma comment(lib, "opengl32.lib")
#pragma comment(lib, "glu32.lib") #pragma comment(lib, "glu32.lib")
@@ -743,8 +747,10 @@ RString RageDisplay_Legacy::TryVideoMode( const VideoModeParams &p, bool &bNewDe
#if defined(WINDOWS) #if defined(WINDOWS)
/* Set vsync the Windows way, if we can. (What other extensions are there /* Set vsync the Windows way, if we can. (What other extensions are there
* to do this, for other archs?) */ * to do this, for other archs?) */
if (GLEW_WGL_EXT_swap_control) if( wglewIsSupported("WGL_EXT_swap_control") )
wglSwapIntervalEXT(p.vsync); wglSwapIntervalEXT(p.vsync);
else
return RString("The WGL_EXT_swap_control extension is not supported on your computer.");
#endif #endif
ResolutionChanged(); ResolutionChanged();
src/StepMania-net2003.vcproj
+19 -6
View File
@@ -25,8 +25,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHa" AdditionalOptions="/EHa"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;;est" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;;est;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="FALSE" ExceptionHandling="FALSE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="2" RuntimeLibrary="2"
@@ -109,8 +109,8 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OptimizeForProcessor="2" OptimizeForProcessor="2"
OptimizeForWindowsApplication="TRUE" OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="TRUE" StringPooling="TRUE"
MinimalRebuild="FALSE" MinimalRebuild="FALSE"
ExceptionHandling="FALSE" ExceptionHandling="FALSE"
@@ -190,8 +190,8 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHa" AdditionalOptions="/EHa"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;ffmpeg\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="FALSE" ExceptionHandling="FALSE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
RuntimeLibrary="2" RuntimeLibrary="2"
@@ -259,6 +259,19 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<References> <References>
</References> </References>
<Files> <Files>
<Filter Name="glew-1.5.8" Filter="">
<File RelativePath="..\extern\glew-1.5.8\src\glew.c">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
<FileConfiguration Name="FastDebug|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
</File>
</Filter>
<Filter <Filter
Name="Screens" Name="Screens"
Filter=""> Filter="">
src/StepMania-net2005.vcproj
+19 -6
View File
@@ -49,8 +49,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -156,8 +156,8 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
ExceptionHandling="0" ExceptionHandling="0"
@@ -261,8 +261,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\include;BaseClasses;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -335,6 +335,19 @@
<References> <References>
</References> </References>
<Files> <Files>
<Filter Name="glew-1.5.8">
<File RelativePath="..\extern\glew-1.5.8\src\glew.c">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
<FileConfiguration Name="FastDebug|Win32">
<Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0" />
</FileConfiguration>
</File>
</Filter>
<Filter <Filter
Name="Screens" Name="Screens"
> >
src/StepMania-net2008.vcproj
+48 -8
View File
@@ -50,8 +50,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -157,8 +157,8 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
ExceptionHandling="0" ExceptionHandling="0"
@@ -261,8 +261,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -368,8 +368,8 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.1\include&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
ExceptionHandling="0" ExceptionHandling="0"
@@ -445,6 +445,46 @@
<References> <References>
</References> </References>
<Files> <Files>
<Filter
Name="glew-1.5.8"
>
<File
RelativePath="..\extern\glew-1.5.8\src\glew.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="FastDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
</Filter>
<Filter <Filter
Name="Screens" Name="Screens"
> >
src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp
+2 -2
View File
@@ -10,7 +10,7 @@
#include "RageDisplay_OGL_Helpers.h" #include "RageDisplay_OGL_Helpers.h"
#include "RageDisplay_OGL.h" #include "RageDisplay_OGL.h"
#include <GL/gl.h> #include <GL/glew.h>
static PIXELFORMATDESCRIPTOR g_CurrentPixelFormat; static PIXELFORMATDESCRIPTOR g_CurrentPixelFormat;
static HGLRC g_HGLRC = NULL; static HGLRC g_HGLRC = NULL;
@@ -351,7 +351,7 @@ void RenderTarget_Win32::Create(const RenderTargetParam &param, int &iTextureWid
GLenum internalformat; GLenum internalformat;
GLenum type = param.bWithAlpha? GL_RGBA:GL_RGB; GLenum type = param.bWithAlpha? GL_RGBA:GL_RGB;
if( param.bFloat && GLExt.m_bGL_ARB_texture_float ) if( param.bFloat && GLEW_ARB_texture_float )
internalformat = param.bWithAlpha? GL_RGBA16F_ARB:GL_RGB16F_ARB; internalformat = param.bWithAlpha? GL_RGBA16F_ARB:GL_RGB16F_ARB;
else else
internalformat = param.bWithAlpha? GL_RGBA8:GL_RGB8; internalformat = param.bWithAlpha? GL_RGBA8:GL_RGB8;