Skip to content
Permalink
Browse files

added 64-bit windows binary and differnt error if program binary was …

…not found
  • Loading branch information...
pixeljetstream committed Feb 12, 2015
1 parent f9a5453 commit 3183daacaa955b6c607a38bdb796bcb6c8c46a19
BIN +512 Bytes (100%) bin_Windows_32/glslc.exe
Binary file not shown.
Binary file not shown.
@@ -6,13 +6,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Debug|Win32.ActiveCfg = Debug|Win32
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Debug|Win32.Build.0 = Debug|Win32
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Debug|x64.ActiveCfg = Debug|x64
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Debug|x64.Build.0 = Debug|x64
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Release|Win32.ActiveCfg = Release|Win32
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Release|Win32.Build.0 = Release|Win32
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Release|x64.ActiveCfg = Release|x64
{E32F45B1-B3B0-4B42-AD24-67CE243BD511}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="glslc"
ProjectGUID="{E32F45B1-B3B0-4B42-AD24-67CE243BD511}"
RootNamespace="glslc"
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -91,8 +94,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -160,6 +163,152 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib"
OutputFile="..\bin_Windows_64_debug\$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib"
OutputFile="..\bin_Windows_64\$(ProjectName).exe"
LinkIncremental="0"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
@@ -28,7 +28,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#define GLSLC_VERSION 7
#define GLSLC_VERSION 8

#include <cstdio>
#include <cstring>
@@ -927,6 +927,12 @@ int main(int argc, char **argv)
GLsizei binaryLength = 0;
GLenum format = 0;
glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH,&binaryLength);

if (!binaryLength){
fprintf(stderr,"error: could not retrieve program binary\n");
return 1;
}

std::string binary(size_t(binaryLength+1),0);
glGetProgramBinary(program,binaryLength,NULL,&format,&binary[0]);

0 comments on commit 3183daa

Please sign in to comment.
You can’t perform that action at this time.