Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Update shader_material_glsl example to include texture sampling #5215

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Update shader_material_glsl example to include texture sampling #5215

wants to merge 2 commits into from

Conversation

BorisBoutillier
Copy link
Contributor

Objective

Add texture sampling to the GLSL shader example, as naga does not support the commonly used sampler2d type.
Fixes #5059

Solution

  • Align the shader_material_glsl example behaviour with the shader_material example, as the later includes texture sampling.
  • Update the GLSL shader to do texture sampling the way naga supports it, and document the way naga does not support it.

Changelog

  • The shader_material_glsl example has been updated to demonstrate texture sampling using the GLSL shading language.

superdump
superdump requested changes Jul 5, 2022
View reviewed changes
Copy link
Contributor

@superdump superdump left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me just a minor request.

examples/shader/shader_material_glsl.rs Outdated Show resolved Hide resolved
@BorisBoutillier BorisBoutillier force-pushed the add_texture_to_shader_glsl_example branch from e34a42c to c146f8a Compare July 5, 2022 16:05
@alice-i-cecile alice-i-cecile added A-Rendering Drawing game state to the screen C-Examples An addition or correction to our examples labels Jul 5, 2022
@alice-i-cecile alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Jul 5, 2022
@BorisBoutillier
Update the shader_material_glsl example to have the exact same behavi…
65dd65c 
…our as the shader_material example, but using the GLSL shading language.
@BorisBoutillier BorisBoutillier force-pushed the add_texture_to_shader_glsl_example branch from c146f8a to 65dd65c Compare July 5, 2022 18:49
@cart
Copy link
Member

cart commented Jul 8, 2022

bors r+

bors bot pushed a commit that referenced this pull request Jul 8, 2022
@BorisBoutillier @cart
Update shader_material_glsl example to include texture sampling (#5215)
6b073ee 
# Objective

Add texture sampling to the GLSL shader example, as naga does not support the commonly used sampler2d type.
Fixes #5059

## Solution

- Align the shader_material_glsl example behaviour with the shader_material example,  as the later includes texture sampling.
- Update the GLSL shader to do texture sampling the way naga supports it, and document the way naga does not support it.

## Changelog

- The shader_material_glsl example has been updated to demonstrate texture sampling using the GLSL shading language.


Co-authored-by: Carter Anderson <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jul 8, 2022

Pull request successfully merged into main.

Build succeeded:

@bors bors bot changed the title Update shader_material_glsl example to include texture sampling [Merged by Bors] - Update shader_material_glsl example to include texture sampling Jul 8, 2022
@bors bors bot closed this Jul 8, 2022
inodentry pushed a commit to IyesGames/bevy that referenced this pull request Aug 8, 2022
@BorisBoutillier @cart @inodentry
Update shader_material_glsl example to include texture sampling (bevy…
9106e0d 
…engine#5215)

# Objective

Add texture sampling to the GLSL shader example, as naga does not support the commonly used sampler2d type.
Fixes bevyengine#5059

## Solution

- Align the shader_material_glsl example behaviour with the shader_material example,  as the later includes texture sampling.
- Update the GLSL shader to do texture sampling the way naga supports it, and document the way naga does not support it.

## Changelog

- The shader_material_glsl example has been updated to demonstrate texture sampling using the GLSL shading language.


Co-authored-by: Carter Anderson <[email protected]>
james7132 pushed a commit to james7132/bevy that referenced this pull request Oct 28, 2022
@BorisBoutillier @cart @james7132
Update shader_material_glsl example to include texture sampling (bevy…
48fa4ae 
…engine#5215)

# Objective

Add texture sampling to the GLSL shader example, as naga does not support the commonly used sampler2d type.
Fixes bevyengine#5059

## Solution

- Align the shader_material_glsl example behaviour with the shader_material example,  as the later includes texture sampling.
- Update the GLSL shader to do texture sampling the way naga supports it, and document the way naga does not support it.

## Changelog

- The shader_material_glsl example has been updated to demonstrate texture sampling using the GLSL shading language.


Co-authored-by: Carter Anderson <[email protected]>
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
@BorisBoutillier @cart @ItsDoot
Update shader_material_glsl example to include texture sampling (bevy…
6756d7e 
…engine#5215)

# Objective

Add texture sampling to the GLSL shader example, as naga does not support the commonly used sampler2d type.
Fixes bevyengine#5059

## Solution

- Align the shader_material_glsl example behaviour with the shader_material example,  as the later includes texture sampling.
- Update the GLSL shader to do texture sampling the way naga supports it, and document the way naga does not support it.

## Changelog

- The shader_material_glsl example has been updated to demonstrate texture sampling using the GLSL shading language.


Co-authored-by: Carter Anderson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@superdump superdump superdump approved these changes

@cart cart cart left review comments

@alice-i-cecile alice-i-cecile alice-i-cecile approved these changes

@mockersf mockersf mockersf approved these changes

@glfmn glfmn glfmn left review comments

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Examples An addition or correction to our examples S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add texture sampler to GLSL example
6 participants
@BorisBoutillier @cart @superdump @alice-i-cecile @mockersf @glfmn