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
19c6e591
Commit
19c6e591
authored
Oct 12, 2015
by
Rex Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix an issue related with texelFetchOffset
parent
86e60813
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
2 deletions
+4
-2
newTexture.frag.out
Test/baseResults/newTexture.frag.out
+0
-0
spv.newTexture.frag.out
Test/baseResults/spv.newTexture.frag.out
+0
-0
newTexture.frag
Test/newTexture.frag
+1
-1
spv.newTexture.frag
Test/spv.newTexture.frag
+2
-0
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+1
-1
No files found.
Test/baseResults/newTexture.frag.out
View file @
19c6e591
This diff is collapsed.
Click to expand it.
Test/baseResults/spv.newTexture.frag.out
View file @
19c6e591
This diff is collapsed.
Click to expand it.
Test/newTexture.frag
View file @
19c6e591
...
@@ -41,6 +41,7 @@ void main()
...
@@ -41,6 +41,7 @@ void main()
v
.
y
+=
textureOffset
(
s2DShadow
,
c3D
,
ivec2
(
3
),
c1D
);
v
.
y
+=
textureOffset
(
s2DShadow
,
c3D
,
ivec2
(
3
),
c1D
);
v
+=
texelFetch
(
s3D
,
ic3D
,
ic1D
);
v
+=
texelFetch
(
s3D
,
ic3D
,
ic1D
);
v
+=
texelFetchOffset
(
s2D
,
ic2D
,
4
,
ivec2
(
3
));
v
+=
texelFetchOffset
(
s2D
,
ic2D
,
4
,
ivec2
(
3
));
v
+=
texelFetchOffset
(
sr
,
ic2D
,
ivec2
(
4
));
v
.
y
+=
textureLodOffset
(
s2DShadow
,
c3D
,
c1D
,
ivec2
(
3
));
v
.
y
+=
textureLodOffset
(
s2DShadow
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureProjLodOffset
(
s2D
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureProjLodOffset
(
s2D
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureGrad
(
sCube
,
c3D
,
c3D
,
c3D
);
v
+=
textureGrad
(
sCube
,
c3D
,
c3D
,
c3D
);
...
@@ -62,7 +63,6 @@ void main()
...
@@ -62,7 +63,6 @@ void main()
v
+=
vec4
(
iv
);
v
+=
vec4
(
iv
);
iv
=
texelFetch
(
is2DArray
,
ic3D
,
ic1D
);
iv
=
texelFetch
(
is2DArray
,
ic3D
,
ic1D
);
v
+=
vec4
(
iv
);
v
+=
vec4
(
iv
);
iv
+=
texelFetch
(
is2Dms
,
ic2D
,
ic1D
);
iv
+=
texelFetch
(
is2Dms
,
ic2D
,
ic1D
);
v
+=
vec4
(
iv
);
v
+=
vec4
(
iv
);
v
+=
texelFetch
(
sb
,
ic1D
);
v
+=
texelFetch
(
sb
,
ic1D
);
...
...
Test/spv.newTexture.frag
View file @
19c6e591
#version 430
#version 430
uniform
sampler2D
s2D
;
uniform
sampler2D
s2D
;
uniform
sampler2DRect
sr
;
uniform
sampler3D
s3D
;
uniform
sampler3D
s3D
;
uniform
samplerCube
sCube
;
uniform
samplerCube
sCube
;
uniform
samplerCubeShadow
sCubeShadow
;
uniform
samplerCubeShadow
sCubeShadow
;
...
@@ -39,6 +40,7 @@ void main()
...
@@ -39,6 +40,7 @@ void main()
v
.
y
+=
textureOffset
(
s2DShadow
,
c3D
,
ivec2
(
3
),
c1D
);
v
.
y
+=
textureOffset
(
s2DShadow
,
c3D
,
ivec2
(
3
),
c1D
);
v
+=
texelFetch
(
s3D
,
ic3D
,
ic1D
);
v
+=
texelFetch
(
s3D
,
ic3D
,
ic1D
);
v
+=
texelFetchOffset
(
s2D
,
ic2D
,
4
,
ivec2
(
3
));
v
+=
texelFetchOffset
(
s2D
,
ic2D
,
4
,
ivec2
(
3
));
v
+=
texelFetchOffset
(
sr
,
ic2D
,
ivec2
(
4
));
v
.
y
+=
textureLodOffset
(
s2DShadow
,
c3D
,
c1D
,
ivec2
(
3
));
v
.
y
+=
textureLodOffset
(
s2DShadow
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureProjLodOffset
(
s2D
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureProjLodOffset
(
s2D
,
c3D
,
c1D
,
ivec2
(
3
));
v
+=
textureGrad
(
sCube
,
c3D
,
c3D
,
c3D
);
v
+=
textureGrad
(
sCube
,
c3D
,
c3D
,
c3D
);
...
...
glslang/MachineIndependent/ParseHelper.cpp
View file @
19c6e591
...
@@ -1431,7 +1431,7 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
...
@@ -1431,7 +1431,7 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
int
arg
=
-
1
;
int
arg
=
-
1
;
switch
(
callNode
.
getOp
())
{
switch
(
callNode
.
getOp
())
{
case
EOpTextureOffset
:
arg
=
2
;
break
;
case
EOpTextureOffset
:
arg
=
2
;
break
;
case
EOpTextureFetchOffset
:
arg
=
3
;
break
;
case
EOpTextureFetchOffset
:
arg
=
(
arg0
->
getType
().
getSampler
().
dim
!=
EsdRect
)
?
3
:
2
;
break
;
case
EOpTextureProjOffset
:
arg
=
2
;
break
;
case
EOpTextureProjOffset
:
arg
=
2
;
break
;
case
EOpTextureLodOffset
:
arg
=
3
;
break
;
case
EOpTextureLodOffset
:
arg
=
3
;
break
;
case
EOpTextureProjLodOffset
:
arg
=
3
;
break
;
case
EOpTextureProjLodOffset
:
arg
=
3
;
break
;
...
...
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