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
ba018e67
Commit
ba018e67
authored
Jun 05, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SPV: Fix #1399 emit ImageGatherExtended when using ConstOffsets operand
parent
ad7645f4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
2 deletions
+8
-2
SpvBuilder.cpp
SPIRV/SpvBuilder.cpp
+3
-1
hlsl.gathercmpRGBA.offset.dx10.frag.out
Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
+1
-0
spv.float16Fetch.frag.out
Test/baseResults/spv.float16Fetch.frag.out
+1
-0
spv.sparseTexture.frag.out
Test/baseResults/spv.sparseTexture.frag.out
+1
-0
spv.textureGatherBiasLod.frag.out
Test/baseResults/spv.textureGatherBiasLod.frag.out
+1
-0
revision.h
glslang/Include/revision.h
+1
-1
No files found.
SPIRV/SpvBuilder.cpp
100644 → 100755
View file @
ba018e67
...
@@ -1570,7 +1570,8 @@ Id Builder::createBuiltinCall(Id resultType, Id builtins, int entryPoint, const
...
@@ -1570,7 +1570,8 @@ Id Builder::createBuiltinCall(Id resultType, Id builtins, int entryPoint, const
// Accept all parameters needed to create a texture instruction.
// Accept all parameters needed to create a texture instruction.
// Create the correct instruction based on the inputs, and make the call.
// Create the correct instruction based on the inputs, and make the call.
Id
Builder
::
createTextureCall
(
Decoration
precision
,
Id
resultType
,
bool
sparse
,
bool
fetch
,
bool
proj
,
bool
gather
,
bool
noImplicitLod
,
const
TextureParameters
&
parameters
)
Id
Builder
::
createTextureCall
(
Decoration
precision
,
Id
resultType
,
bool
sparse
,
bool
fetch
,
bool
proj
,
bool
gather
,
bool
noImplicitLod
,
const
TextureParameters
&
parameters
)
{
{
static
const
int
maxTextureArgs
=
10
;
static
const
int
maxTextureArgs
=
10
;
Id
texArgs
[
maxTextureArgs
]
=
{};
Id
texArgs
[
maxTextureArgs
]
=
{};
...
@@ -1623,6 +1624,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
...
@@ -1623,6 +1624,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
texArgs
[
numArgs
++
]
=
parameters
.
offset
;
texArgs
[
numArgs
++
]
=
parameters
.
offset
;
}
}
if
(
parameters
.
offsets
)
{
if
(
parameters
.
offsets
)
{
addCapability
(
CapabilityImageGatherExtended
);
mask
=
(
ImageOperandsMask
)(
mask
|
ImageOperandsConstOffsetsMask
);
mask
=
(
ImageOperandsMask
)(
mask
|
ImageOperandsConstOffsetsMask
);
texArgs
[
numArgs
++
]
=
parameters
.
offsets
;
texArgs
[
numArgs
++
]
=
parameters
.
offsets
;
}
}
...
...
Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
View file @
ba018e67
...
@@ -460,6 +460,7 @@ using depth_any
...
@@ -460,6 +460,7 @@ using depth_any
// Id's are bound by 164
// Id's are bound by 164
Capability Shader
Capability Shader
Capability ImageGatherExtended
Capability Sampled1D
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
MemoryModel Logical GLSL450
...
...
Test/baseResults/spv.float16Fetch.frag.out
View file @
ba018e67
...
@@ -5,6 +5,7 @@ spv.float16Fetch.frag
...
@@ -5,6 +5,7 @@ spv.float16Fetch.frag
Capability Shader
Capability Shader
Capability Float16
Capability Float16
Capability ImageGatherExtended
Capability StorageImageMultisample
Capability StorageImageMultisample
Capability ImageCubeArray
Capability ImageCubeArray
Capability ImageRect
Capability ImageRect
...
...
Test/baseResults/spv.sparseTexture.frag.out
View file @
ba018e67
...
@@ -4,6 +4,7 @@ spv.sparseTexture.frag
...
@@ -4,6 +4,7 @@ spv.sparseTexture.frag
// Id's are bound by 438
// Id's are bound by 438
Capability Shader
Capability Shader
Capability ImageGatherExtended
Capability StorageImageMultisample
Capability StorageImageMultisample
Capability SampledRect
Capability SampledRect
Capability SparseResidency
Capability SparseResidency
...
...
Test/baseResults/spv.textureGatherBiasLod.frag.out
View file @
ba018e67
...
@@ -4,6 +4,7 @@ spv.textureGatherBiasLod.frag
...
@@ -4,6 +4,7 @@ spv.textureGatherBiasLod.frag
// Id's are bound by 298
// Id's are bound by 298
Capability Shader
Capability Shader
Capability ImageGatherExtended
Capability SparseResidency
Capability SparseResidency
Capability SampledCubeArray
Capability SampledCubeArray
Capability ImageGatherBiasLodAMD
Capability ImageGatherBiasLodAMD
...
...
glslang/Include/revision.h
View file @
ba018e67
// This header is generated by the make-revision script.
// This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 276
5
#define GLSLANG_PATCH_LEVEL 276
7
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