Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
fd30542a
Commit
fd30542a
authored
Jun 05, 2014
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non-functional trivial clean up.
git-svn-id:
https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26972
e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent
3591930f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
StandAlone/CMakeLists.txt
+2
-2
StandAlone.cpp
StandAlone/StandAlone.cpp
+2
-2
ShaderLang.h
glslang/Public/ShaderLang.h
+1
-1
No files found.
StandAlone/CMakeLists.txt
View file @
fd30542a
...
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
...
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
include_directories
(
.
)
include_directories
(
.
)
if
(
WIN32
)
if
(
WIN32
)
include_directories
(
${
include_directories
}
../glslang/OSDependent/Windows
)
include_directories
(
../glslang/OSDependent/Windows
)
elseif
(
UNIX
)
elseif
(
UNIX
)
include_directories
(
${
include_directories
}
../glslang/OSDependent/Linux
)
include_directories
(
../glslang/OSDependent/Linux
)
else
(
WIN32
)
else
(
WIN32
)
message
(
"unkown platform"
)
message
(
"unkown platform"
)
endif
(
WIN32
)
endif
(
WIN32
)
...
...
StandAlone/StandAlone.cpp
View file @
fd30542a
...
@@ -428,7 +428,7 @@ void ProcessConfigFile()
...
@@ -428,7 +428,7 @@ void ProcessConfigFile()
glslang
::
TWorklist
Worklist
;
glslang
::
TWorklist
Worklist
;
// array of unique places to leave the shader names and infologs for the asynchronous compiles
// array of unique places to leave the shader names and infologs for the asynchronous compiles
glslang
::
TWorkItem
**
Work
=
0
;
glslang
::
TWorkItem
**
Work
=
0
;
int
NumWorkItems
=
0
;
int
NumWorkItems
=
0
;
int
Options
=
0
;
int
Options
=
0
;
...
@@ -455,7 +455,7 @@ bool ProcessArguments(int argc, char* argv[])
...
@@ -455,7 +455,7 @@ bool ProcessArguments(int argc, char* argv[])
{
{
ExecutableName
=
argv
[
0
];
ExecutableName
=
argv
[
0
];
NumWorkItems
=
argc
;
// will include some empties where the '-' options were, but it doesn't matter, they'll be 0
NumWorkItems
=
argc
;
// will include some empties where the '-' options were, but it doesn't matter, they'll be 0
Work
=
new
glslang
::
TWorkItem
*
[
NumWorkItems
];
Work
=
new
glslang
::
TWorkItem
*
[
NumWorkItems
];
Work
[
0
]
=
0
;
Work
[
0
]
=
0
;
argc
--
;
argc
--
;
...
...
glslang/Public/ShaderLang.h
View file @
fd30542a
...
@@ -190,7 +190,7 @@ SH_IMPORT_EXPORT int ShLink(
...
@@ -190,7 +190,7 @@ SH_IMPORT_EXPORT int ShLink(
const
int
numHandles
,
const
int
numHandles
,
ShHandle
uniformMap
,
// updated with new uniforms
ShHandle
uniformMap
,
// updated with new uniforms
short
int
**
uniformsAccessed
,
// returned with indexes of uniforms accessed
short
int
**
uniformsAccessed
,
// returned with indexes of uniforms accessed
int
*
numUniformsAccessed
);
int
*
numUniformsAccessed
);
SH_IMPORT_EXPORT
int
ShLinkExt
(
SH_IMPORT_EXPORT
int
ShLinkExt
(
const
ShHandle
,
// linker object
const
ShHandle
,
// linker object
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment