Skip to content
This repository has been archived by the owner on Jan 29, 2025. It is now read-only.

glsl-out: texture function fixes #1742

Merged
merged 2 commits into from
Feb 24, 2022
Merged

Conversation

JCapucho
Copy link
Collaborator

  • samplerCubeShadow requires vec3 gradients
  • Bias must be written after offset
  • sampler1D hack on GLES requires vec2 gradients
  • textureSize doesn't accept a lod argument for MS samplers
  • sampler1DArray hack on GLES requires a y component on imageLoad

Also adds some tests in wgsl

@JCapucho JCapucho requested a review from jimblandy February 22, 2022 16:48
@JCapucho
Copy link
Collaborator Author

JCapucho commented Feb 22, 2022

Had to also patch spv-out since it suffered the same problem of using lod for ImageSizes on multisampled images

@JCapucho JCapucho force-pushed the glsl-out-function-fixes branch 2 times, most recently from 700da14 to 8fa35be Compare February 22, 2022 17:09
src/back/glsl/mod.rs Outdated Show resolved Hide resolved
src/back/glsl/mod.rs Outdated Show resolved Hide resolved
- samplerCubeShadow requires vec3 gradients
- Bias must be written after offset
- sampler1D hack on GLES requires vec2 gradients
- textureSize doesn't accept a lod argument for MS samplers
- sampler1DArray hack on GLES requires a y component on imageLoad
@JCapucho JCapucho force-pushed the glsl-out-function-fixes branch from 8fa35be to 92d096f Compare February 22, 2022 21:22
@JCapucho
Copy link
Collaborator Author

@kvark thanks for the review, should I take your approval as a merge once fixed?

@kvark
Copy link
Member

kvark commented Feb 24, 2022

Yes, that was the idea. If I'm not sure that merge is OK after fixes, I'm not making it "Approved" :)

@kvark kvark merged commit 98e7add into gfx-rs:master Feb 24, 2022
@JCapucho JCapucho deleted the glsl-out-function-fixes branch February 24, 2022 16:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants