Skip to content
Snippets Groups Projects
Commit a5c33d6f authored by John Kessenich's avatar John Kessenich
Browse files

SPV: Fix issue #320: Fetch needs to extract the image. 

GLSL takes a traditional sampler, but SPIR-V wants just the
sampled image, not the combined sampler and image.
parent 98f2b3bf
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
SPIRV/GlslangToSpv.cpp
+ 7
− 0
View file @ a5c33d6f
...@@ -2558,6 +2558,13 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO ...@@ -2558,6 +2558,13 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
bias = true; bias = true;
} }
// See if the sampler param should really be just the SPV image part
if (cracked.fetch) {
// a fetch needs to have the image extracted first
if (builder.isSampledImage(params.sampler))
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
}
// set the rest of the arguments // set the rest of the arguments
params.coords = arguments[1]; params.coords = arguments[1];
......
Test/baseResults/spv.newTexture.frag.out
+ 247
− 243
View file @ a5c33d6f
This diff is collapsed.
Test/baseResults/spv.sparseTexture.frag.out
+ 349
− 344
View file @ a5c33d6f
This diff is collapsed.
Test/baseResults/spv.texture.frag.out
+ 92
− 91
View file @ a5c33d6f
...@@ -9,13 +9,13 @@ Linked fragment stage: ...@@ -9,13 +9,13 @@ Linked fragment stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 290 // Id's are bound by 291
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 47 276 279 282 288 289 EntryPoint Fragment 4 "main" 47 277 280 283 289 290
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source GLSL 140 Source GLSL 140
Name 4 "main" Name 4 "main"
...@@ -36,13 +36,13 @@ Linked fragment stage: ...@@ -36,13 +36,13 @@ Linked fragment stage:
Name 158 "shadowSampler2D" Name 158 "shadowSampler2D"
Name 207 "iCoords2D" Name 207 "iCoords2D"
Name 212 "iLod" Name 212 "iLod"
Name 221 "gradX" Name 222 "gradX"
Name 224 "gradY" Name 225 "gradY"
Name 276 "gl_FragColor" Name 277 "gl_FragColor"
Name 279 "u" Name 280 "u"
Name 282 "blend" Name 283 "blend"
Name 288 "scale" Name 289 "scale"
Name 289 "t" Name 290 "t"
Decorate 32(texSampler1D) DescriptorSet 0 Decorate 32(texSampler1D) DescriptorSet 0
Decorate 72(texSampler2D) DescriptorSet 0 Decorate 72(texSampler2D) DescriptorSet 0
Decorate 98(texSampler3D) DescriptorSet 0 Decorate 98(texSampler3D) DescriptorSet 0
...@@ -101,18 +101,18 @@ Linked fragment stage: ...@@ -101,18 +101,18 @@ Linked fragment stage:
210: 205(ivec2) ConstantComposite 208 209 210: 205(ivec2) ConstantComposite 208 209
211: TypePointer Function 204(int) 211: TypePointer Function 204(int)
213: 204(int) Constant 1 213: 204(int) Constant 1
220: TypePointer Function 45(fvec2) 221: TypePointer Function 45(fvec2)
249: 204(int) Constant 3 250: 204(int) Constant 3
250: 204(int) Constant 4294967289 251: 204(int) Constant 4294967289
251: 205(ivec2) ConstantComposite 249 250 252: 205(ivec2) ConstantComposite 250 251
275: TypePointer Output 22(fvec4) 276: TypePointer Output 22(fvec4)
276(gl_FragColor): 275(ptr) Variable Output 277(gl_FragColor): 276(ptr) Variable Output
278: TypePointer Input 22(fvec4) 279: TypePointer Input 22(fvec4)
279(u): 278(ptr) Variable Input 280(u): 279(ptr) Variable Input
281: TypePointer Input 6(float) 282: TypePointer Input 6(float)
282(blend): 281(ptr) Variable Input 283(blend): 282(ptr) Variable Input
288(scale): 46(ptr) Variable Input 289(scale): 46(ptr) Variable Input
289(t): 46(ptr) Variable Input 290(t): 46(ptr) Variable Input
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(blendscale): 7(ptr) Variable Function 8(blendscale): 7(ptr) Variable Function
...@@ -125,8 +125,8 @@ Linked fragment stage: ...@@ -125,8 +125,8 @@ Linked fragment stage:
26(color): 23(ptr) Variable Function 26(color): 23(ptr) Variable Function
207(iCoords2D): 206(ptr) Variable Function 207(iCoords2D): 206(ptr) Variable Function
212(iLod): 211(ptr) Variable Function 212(iLod): 211(ptr) Variable Function
221(gradX): 220(ptr) Variable Function 222(gradX): 221(ptr) Variable Function
224(gradY): 220(ptr) Variable Function 225(gradY): 221(ptr) Variable Function
Store 8(blendscale) 9 Store 8(blendscale) 9
Store 10(bias) 11 Store 10(bias) 11
Store 12(lod) 13 Store 12(lod) 13
...@@ -312,73 +312,74 @@ Linked fragment stage: ...@@ -312,73 +312,74 @@ Linked fragment stage:
214: 70 Load 72(texSampler2D) 214: 70 Load 72(texSampler2D)
215: 205(ivec2) Load 207(iCoords2D) 215: 205(ivec2) Load 207(iCoords2D)
216: 204(int) Load 212(iLod) 216: 204(int) Load 212(iLod)
217: 22(fvec4) ImageFetch 214 215 Lod 216 217: 69 Image 214
218: 22(fvec4) Load 26(color) 218: 22(fvec4) ImageFetch 217 215 Lod 216
219: 22(fvec4) FAdd 218 217 219: 22(fvec4) Load 26(color)
Store 26(color) 219 220: 22(fvec4) FAdd 219 218
222: 45(fvec2) Load 47(coords2D) Store 26(color) 220
223: 45(fvec2) DPdx 222 223: 45(fvec2) Load 47(coords2D)
Store 221(gradX) 223 224: 45(fvec2) DPdx 223
225: 45(fvec2) Load 47(coords2D) Store 222(gradX) 224
226: 45(fvec2) DPdy 225 226: 45(fvec2) Load 47(coords2D)
Store 224(gradY) 226 227: 45(fvec2) DPdy 226
227: 70 Load 72(texSampler2D) Store 225(gradY) 227
228: 45(fvec2) Load 47(coords2D) 228: 70 Load 72(texSampler2D)
229: 45(fvec2) Load 221(gradX) 229: 45(fvec2) Load 47(coords2D)
230: 45(fvec2) Load 224(gradY) 230: 45(fvec2) Load 222(gradX)
231: 22(fvec4) ImageSampleExplicitLod 227 228 Grad 229 230 231: 45(fvec2) Load 225(gradY)
232: 22(fvec4) Load 26(color) 232: 22(fvec4) ImageSampleExplicitLod 228 229 Grad 230 231
233: 22(fvec4) FAdd 232 231 233: 22(fvec4) Load 26(color)
Store 26(color) 233 234: 22(fvec4) FAdd 233 232
234: 70 Load 72(texSampler2D) Store 26(color) 234
235: 45(fvec2) Load 47(coords2D) 235: 70 Load 72(texSampler2D)
236: 6(float) Load 14(proj) 236: 45(fvec2) Load 47(coords2D)
237: 6(float) CompositeExtract 235 0 237: 6(float) Load 14(proj)
238: 6(float) CompositeExtract 235 1 238: 6(float) CompositeExtract 236 0
239: 16(fvec3) CompositeConstruct 237 238 236 239: 6(float) CompositeExtract 236 1
240: 45(fvec2) Load 221(gradX) 240: 16(fvec3) CompositeConstruct 238 239 237
241: 45(fvec2) Load 224(gradY) 241: 45(fvec2) Load 222(gradX)
242: 22(fvec4) ImageSampleProjExplicitLod 234 239 Grad 240 241 242: 45(fvec2) Load 225(gradY)
243: 22(fvec4) Load 26(color) 243: 22(fvec4) ImageSampleProjExplicitLod 235 240 Grad 241 242
244: 22(fvec4) FAdd 243 242 244: 22(fvec4) Load 26(color)
Store 26(color) 244 245: 22(fvec4) FAdd 244 243
245: 70 Load 72(texSampler2D) Store 26(color) 245
246: 45(fvec2) Load 47(coords2D) 246: 70 Load 72(texSampler2D)
247: 45(fvec2) Load 221(gradX) 247: 45(fvec2) Load 47(coords2D)
248: 45(fvec2) Load 224(gradY) 248: 45(fvec2) Load 222(gradX)
252: 22(fvec4) ImageSampleExplicitLod 245 246 Grad ConstOffset 247 248 251 249: 45(fvec2) Load 225(gradY)
253: 22(fvec4) Load 26(color) 253: 22(fvec4) ImageSampleExplicitLod 246 247 Grad ConstOffset 248 249 252
254: 22(fvec4) FAdd 253 252 254: 22(fvec4) Load 26(color)
Store 26(color) 254 255: 22(fvec4) FAdd 254 253
255: 70 Load 72(texSampler2D) Store 26(color) 255
256: 16(fvec3) Load 18(coords3D) 256: 70 Load 72(texSampler2D)
257: 45(fvec2) Load 221(gradX) 257: 16(fvec3) Load 18(coords3D)
258: 45(fvec2) Load 224(gradY) 258: 45(fvec2) Load 222(gradX)
259: 22(fvec4) ImageSampleProjExplicitLod 255 256 Grad ConstOffset 257 258 251 259: 45(fvec2) Load 225(gradY)
260: 22(fvec4) Load 26(color) 260: 22(fvec4) ImageSampleProjExplicitLod 256 257 Grad ConstOffset 258 259 252
261: 22(fvec4) FAdd 260 259 261: 22(fvec4) Load 26(color)
Store 26(color) 261 262: 22(fvec4) FAdd 261 260
262: 156 Load 158(shadowSampler2D) Store 26(color) 262
263: 45(fvec2) Load 47(coords2D) 263: 156 Load 158(shadowSampler2D)
264: 6(float) Load 12(lod) 264: 45(fvec2) Load 47(coords2D)
265: 6(float) CompositeExtract 263 0 265: 6(float) Load 12(lod)
266: 6(float) CompositeExtract 263 1 266: 6(float) CompositeExtract 264 0
267: 16(fvec3) CompositeConstruct 265 266 264 267: 6(float) CompositeExtract 264 1
268: 45(fvec2) Load 221(gradX) 268: 16(fvec3) CompositeConstruct 266 267 265
269: 45(fvec2) Load 224(gradY) 269: 45(fvec2) Load 222(gradX)
270: 6(float) CompositeExtract 267 2 270: 45(fvec2) Load 225(gradY)
271: 6(float) ImageSampleDrefExplicitLod 262 267 270 Grad 268 269 271: 6(float) CompositeExtract 268 2
272: 22(fvec4) Load 26(color) 272: 6(float) ImageSampleDrefExplicitLod 263 268 271 Grad 269 270
273: 22(fvec4) CompositeConstruct 271 271 271 271 273: 22(fvec4) Load 26(color)
274: 22(fvec4) FAdd 272 273 274: 22(fvec4) CompositeConstruct 272 272 272 272
Store 26(color) 274 275: 22(fvec4) FAdd 273 274
277: 22(fvec4) Load 26(color) Store 26(color) 275
280: 22(fvec4) Load 279(u) 278: 22(fvec4) Load 26(color)
283: 6(float) Load 282(blend) 281: 22(fvec4) Load 280(u)
284: 6(float) Load 8(blendscale) 284: 6(float) Load 283(blend)
285: 6(float) FMul 283 284 285: 6(float) Load 8(blendscale)
286: 22(fvec4) CompositeConstruct 285 285 285 285 286: 6(float) FMul 284 285
287: 22(fvec4) ExtInst 1(GLSL.std.450) 46(FMix) 277 280 286 287: 22(fvec4) CompositeConstruct 286 286 286 286
Store 276(gl_FragColor) 287 288: 22(fvec4) ExtInst 1(GLSL.std.450) 46(FMix) 278 281 287
Store 277(gl_FragColor) 288
Return Return
FunctionEnd FunctionEnd
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment