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.

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

Associated types for ShaderParam #507

Merged
merged 2 commits into from
Jan 29, 2015
Merged

Associated types for ShaderParam #507

merged 2 commits into from
Jan 29, 2015

Conversation

sectopod
Copy link
Contributor

Relies on the latest Rust changes in TraitDef.

Closes #400

@@ -136,15 +140,18 @@ pub struct ParamDictionary {
pub textures: Vec<NamedCell<TextureParam>>,
}

/// An associated link structure for `ParamDictionary` that redirects program
/// input to the relevant dictionary cell.
/// An associated parameter link for ParamDictionary
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we change this comment to "Redirects program input to the relevant ParamDictionary cell"

@brendanzab
Copy link
Contributor

Nice. Will this break you on alpha, @csherratt ?

@sectopod
Copy link
Contributor Author

@bjz done! Too bad Travis is still lagging.

@brendanzab
Copy link
Contributor

Looks good. r+ if @csherratt is happy.

@ghost
Copy link

ghost commented Jan 27, 2015

No problem with the change. r+

I'd let travis to be happy before this gets merged.

@brendanzab
Copy link
Contributor

Still waiting on travis... :[

@indiv0
Copy link

indiv0 commented Jan 29, 2015

@bjz travis build failed due to the std::io -> std::old_io migration not being updated for by glfw-sys, which has since been fixed.

@sectopod's branch builds for me locally with an updated gfx_gl with PR #10 (which was also just merged).

I'm not sure if you can trigger a travis rebuild, but it should work now.

@kvark
Copy link
Member

kvark commented Jan 29, 2015

@indiv0 thanks! restarting Travis...

@kvark
Copy link
Member

kvark commented Jan 29, 2015

@indiv0 Travis is still failing in glfw-sys. Are you sure it was fixed?

@kvark
Copy link
Member

kvark commented Jan 29, 2015

Well... if we don't merge, Travis is going to be failing on missing associated_types anyway. Hence, it doesn't make much sense to hold it. Merging...

kvark added a commit that referenced this pull request Jan 29, 2015
Associated types for ShaderParam
@kvark kvark merged commit 2d30b55 into gfx-rs:master Jan 29, 2015
@indiv0
Copy link

indiv0 commented Jan 29, 2015

@kvark weird, it built for me locally. I'll take another look.

EDIT: The merge commit built correctly though?

EDIT2: Nevermind. I am a silly goose and forgot I applied these changes locally.

adamnemecek pushed a commit to adamnemecek/gfx that referenced this pull request Apr 1, 2021
507: Update logo and move bindings section r=kvark a=grovesNL

- Adjust the logo slightly
- Move the bindings section up slightly to hopefully reduce confusion for users coming to gfx-rs/wgpu looking for the Rust bindings (gfx-rs/wgpu-rs)
  - Also added some experimental Julia bindings
  - Open to other ideas how we can improve the repository naming confusion, though long term I think we may want to adjust the naming somehow (like we talked about before the sync was setup)

[Rendered](https://github.com/grovesNL/wgpu-native/blob/8b19724364555c1855eda5349675d925ef0891f5/README.md)

Co-authored-by: Joshua Groves <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor ShaderParam using associated types
4 participants