Remove Bytes enum from ShaderSource

[kvark]

http://www.rust-ci.org/gfx-rs/gfx-rs/doc/device/shade/type.Bytes.html

It was needed when we had an explicit task boundary. No need to wrap owned stuff now.

As a bonus, make sure shaders! macro accepts a trailing comma in the parameters.

cc @Kimundi

[Kimundi]

I'm not sure what exactly is supposed to change here.

I thought we had the Bytes enum to allow both static construction with the macro, and dynamic loading of shader sources?

[kvark]

@Kimundi We don't need to send it now, so we can instead just have a &'a str for every variant of the shader.

[gaudecker]

How could I adapt my function to this change? I get lifetime error if I try to give src.as_bytes() to ShaderSource.

fn load_shader_source(filename: &str) -> IoResult<gfx::ShaderSource> {
    let mut f = match File::open(&Path::new(filename)) {
        Err(why) => panic!("Could not open {}: {}", filename, why.desc),
        Ok(file) => file
    };
    let mut src = match f.read_to_string() {
        Err(why) => panic!("Could not read shader from {}: {}", filename, why.desc),
        Ok(src) => src
    };

    Ok(gfx::ShaderSource {
        glsl_120: None,
        glsl_130: None,
        glsl_140: None,
        glsl_150: Some(gfx::OwnedBytes(src.into_bytes()))
    })
}

[kvark]

@gaudecker it's not going to be a one liner for you. As far as I see, you want to (reasonably) detach the shader code reading from shader creation, in which case there needs to be some sort of container with owned data (provided by you).

The simplest you could do is to return a String from this function, and then only create gl::ShaderSource when you are uploading the shader code.

[brendanzab]

@gaudecker ooh - you are making this? https://github.com/gaudecker/rust-theft-auto

[gaudecker]

@kvark That's what I was thinking of as well. Thanks.
@bjz Yeah, trying at least. :)