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
38c507e7
Commit
38c507e7
authored
Feb 08, 2013
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the default version be 100.
git-svn-id:
https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20509
e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent
46eaf493
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
2 deletions
+13
-2
StandAlone.cpp
StandAlone/StandAlone.cpp
+1
-1
cppIndent.vert
Test/cppIndent.vert
+2
-0
cppNest.vert
Test/cppNest.vert
+2
-0
cppSimple.vert
Test/cppSimple.vert
+2
-0
sample.frag
Test/sample.frag
+1
-0
sample.vert
Test/sample.vert
+1
-0
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+4
-1
No files found.
StandAlone/StandAlone.cpp
View file @
38c507e7
...
@@ -250,7 +250,7 @@ bool CompileFile(char *fileName, ShHandle compiler, int debugOptions, const TBui
...
@@ -250,7 +250,7 @@ bool CompileFile(char *fileName, ShHandle compiler, int debugOptions, const TBui
for
(
int
i
=
0
;
i
<
1000
;
++
i
)
{
for
(
int
i
=
0
;
i
<
1000
;
++
i
)
{
for
(
int
j
=
0
;
j
<
100
;
++
j
)
for
(
int
j
=
0
;
j
<
100
;
++
j
)
#endif
#endif
ret
=
ShCompile
(
compiler
,
data
,
OutputMultipleStrings
,
EShOptNone
,
resources
,
debugOptions
);
ret
=
ShCompile
(
compiler
,
data
,
OutputMultipleStrings
,
EShOptNone
,
resources
,
debugOptions
,
100
);
#ifdef MEASURE_MEMORY
#ifdef MEASURE_MEMORY
GetProcessMemoryInfo
(
GetCurrentProcess
(),
&
counters
,
sizeof
(
counters
));
GetProcessMemoryInfo
(
GetCurrentProcess
(),
&
counters
,
sizeof
(
counters
));
...
...
Test/cppIndent.vert
View file @
38c507e7
#version 110
#define ON
#define ON
float
sum
=
0
.
0
;
float
sum
=
0
.
0
;
...
...
Test/cppNest.vert
View file @
38c507e7
#version 110
#define ON
#define ON
float
sum
=
0
.
0
;
float
sum
=
0
.
0
;
...
...
Test/cppSimple.vert
View file @
38c507e7
#version 110
#define ON
#define ON
float
sum
=
0
.
0
;
float
sum
=
0
.
0
;
...
...
Test/sample.frag
View file @
38c507e7
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE.
//POSSIBILITY OF SUCH DAMAGE.
//
//
#version 110
varying
vec3
color
;
varying
vec3
color
;
...
...
Test/sample.vert
View file @
38c507e7
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE.
//POSSIBILITY OF SUCH DAMAGE.
//
//
#version 110
varying
vec3
color
;
varying
vec3
color
;
...
...
glslang/MachineIndependent/ParseHelper.cpp
View file @
38c507e7
...
@@ -77,7 +77,10 @@ void TParseContext::setVersion(int newVersion)
...
@@ -77,7 +77,10 @@ void TParseContext::setVersion(int newVersion)
defaultPrecision
[
EbtSampler2D
]
=
EpqLow
;
defaultPrecision
[
EbtSampler2D
]
=
EpqLow
;
defaultPrecision
[
EbtSamplerCube
]
=
EpqLow
;
defaultPrecision
[
EbtSamplerCube
]
=
EpqLow
;
}
}
}
}
else
{
for
(
int
type
=
0
;
type
<
EbtNumTypes
;
++
type
)
defaultPrecision
[
type
]
=
EpqNone
;
}
}
}
// Important assumption: SetVersion() is called before SetProfile(), and is always called
// Important assumption: SetVersion() is called before SetProfile(), and is always called
...
...
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