Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
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
angle
Commits
73f5bf61
Commit
73f5bf61
authored
Jun 17, 2013
by
Nicolas Capens
Committed by
Shannon Woods
Jul 19, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add 3D texture intrinsics to the symbol table.
TRAC #23365 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Nicolas Capens
parent
e27c1c3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
BaseTypes.h
src/compiler/BaseTypes.h
+3
-0
Initialize.cpp
src/compiler/Initialize.cpp
+10
-0
No files found.
src/compiler/BaseTypes.h
View file @
73f5bf61
...
...
@@ -42,12 +42,15 @@ enum TBasicType
EbtBool
,
EbtGuardSamplerBegin
,
// non type: see implementation of IsSampler()
EbtSampler2D
,
EbtSampler3D
,
EbtSamplerCube
,
EbtSamplerExternalOES
,
// Only valid if OES_EGL_image_external exists.
EbtSampler2DRect
,
// Only valid if GL_ARB_texture_rectangle exists.
EbtISampler2D
,
EbtISampler3D
,
EbtISamplerCube
,
EbtUSampler2D
,
EbtUSampler3D
,
EbtUSamplerCube
,
EbtGuardSamplerEnd
,
// non type: see implementation of IsSampler()
EbtStruct
,
...
...
src/compiler/Initialize.cpp
View file @
73f5bf61
...
...
@@ -385,30 +385,40 @@ void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltI
symbolTable
.
insertBuiltIn
(
ESSL1_BUILTINS
,
float4
,
"textureCubeLod"
,
samplerCube
,
"sampler"
,
float3
,
"coord"
,
float1
,
"lod"
);
}
TType
*
sampler3D
=
new
TType
(
EbtSampler3D
,
EbpUndefined
,
EvqGlobal
,
1
);
//
// Texture Functions for GLSL ES 3.0
//
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"texture"
,
sampler2D
,
"sampler"
,
float2
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"texture"
,
sampler3D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"texture"
,
samplerCube
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"textureProj"
,
sampler2D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"textureProj"
,
sampler2D
,
"sampler"
,
float4
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
float4
,
"textureProj"
,
sampler3D
,
"sampler"
,
float4
,
"coord"
);
TType
*
isampler2D
=
new
TType
(
EbtISampler2D
,
EbpUndefined
,
EvqGlobal
,
1
);
TType
*
isampler3D
=
new
TType
(
EbtISampler3D
,
EbpUndefined
,
EvqGlobal
,
1
);
TType
*
isamplerCube
=
new
TType
(
EbtISamplerCube
,
EbpUndefined
,
EvqGlobal
,
1
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"texture"
,
isampler2D
,
"sampler"
,
float2
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"texture"
,
isampler3D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"texture"
,
isamplerCube
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"textureProj"
,
isampler2D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"textureProj"
,
isampler2D
,
"sampler"
,
float4
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
int4
,
"textureProj"
,
isampler3D
,
"sampler"
,
float4
,
"coord"
);
TType
*
usampler2D
=
new
TType
(
EbtUSampler2D
,
EbpUndefined
,
EvqGlobal
,
1
);
TType
*
usampler3D
=
new
TType
(
EbtUSampler3D
,
EbpUndefined
,
EvqGlobal
,
1
);
TType
*
usamplerCube
=
new
TType
(
EbtUSamplerCube
,
EbpUndefined
,
EvqGlobal
,
1
);
TType
*
uint4
=
new
TType
(
EbtUInt
,
EbpUndefined
,
EvqGlobal
,
4
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"texture"
,
usampler2D
,
"sampler"
,
float2
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"texture"
,
usampler3D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"texture"
,
usamplerCube
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"textureProj"
,
usampler2D
,
"sampler"
,
float3
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"textureProj"
,
usampler2D
,
"sampler"
,
float4
,
"coord"
);
symbolTable
.
insertBuiltIn
(
ESSL3_BUILTINS
,
uint4
,
"textureProj"
,
usampler3D
,
"sampler"
,
float4
,
"coord"
);
if
(
type
==
SH_FRAGMENT_SHADER
)
{
...
...
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