alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gl: fix sampler binding

Browse source
This commit is contained in:
chyyran 2022-11-26 17:11:26 -05:00
parent 1f068bc0d5
commit 085f3a6444
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librashader-runtime-gl/src/filter_pass.rs
View file

@ -95,7 +95,7 @@ impl FilterPass {
gl::ActiveTexture(gl::TEXTURE0 + binding.binding); gl::ActiveTexture(gl::TEXTURE0 + binding.binding);
gl::BindTexture(gl::TEXTURE_2D, texture.image.handle); gl::BindTexture(gl::TEXTURE_2D, texture.image.handle);
gl::BindSampler(gl::TEXTURE0 + binding.binding, gl::BindSampler(binding.binding,
samplers.get(texture.wrap_mode, texture.filter, texture.mip_filter)); samplers.get(texture.wrap_mode, texture.filter, texture.mip_filter));
// gl::TexParameteri( // gl::TexParameteri(
// gl::TEXTURE_2D, // gl::TEXTURE_2D,

2
librashader-runtime-gl/src/hello_triangle.rs
View file

@ -12,7 +12,7 @@ use crate::framebuffer::{Framebuffer, GlImage, Viewport};
const WIDTH: u32 = 900; const WIDTH: u32 = 900;
const HEIGHT: u32 = 700; const HEIGHT: u32 = 700;
const TITLE: &str = "Hello From OpenGL World!"; const TITLE: &str = "librashader OpenGL";
pub fn compile_program(vertex: &str, fragment: &str) -> GLuint { pub fn compile_program(vertex: &str, fragment: &str) -> GLuint {
let vertex_shader = unsafe { gl::CreateShader(gl::VERTEX_SHADER) }; let vertex_shader = unsafe { gl::CreateShader(gl::VERTEX_SHADER) };

18
librashader-runtime-gl/src/samplers.rs
View file

@ -1,3 +1,4 @@
use std::iter::Filter;
use gl::types::{GLenum, GLint, GLuint}; use gl::types::{GLenum, GLint, GLuint};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use librashader_common::{FilterMode, WrapMode}; use librashader_common::{FilterMode, WrapMode};
@ -32,6 +33,7 @@ impl SamplerSet {
gl::TEXTURE_MAG_FILTER, gl::TEXTURE_MAG_FILTER,
GLenum::from(filter) as GLint, GLenum::from(filter) as GLint,
); );
gl::SamplerParameteri( gl::SamplerParameteri(
sampler, sampler,
gl::TEXTURE_MIN_FILTER, gl::TEXTURE_MIN_FILTER,
@ -47,18 +49,24 @@ impl SamplerSet {
for wrap_mode in wrap_modes { for wrap_mode in wrap_modes {
unsafe { unsafe {
let mut linear_linear = 0; let mut linear_linear = 0;
let mut nearest_nearest = 0;
let mut linear_nearest = 0; let mut linear_nearest = 0;
let mut nearest_nearest = 0;
let mut nearest_linear = 0; let mut nearest_linear = 0;
gl::GenSamplers(1, &mut linear_linear); gl::GenSamplers(1, &mut linear_linear);
gl::GenSamplers(1, &mut linear_nearest); gl::GenSamplers(1, &mut linear_nearest);
gl::GenSamplers(1, &mut nearest_linear); gl::GenSamplers(1, &mut nearest_linear);
gl::GenSamplers(1, &mut nearest_nearest); gl::GenSamplers(1, &mut nearest_nearest);
SamplerSet::make_sampler(linear_linear, *wrap_mode, FilterMode::Linear, FilterMode::Linear); SamplerSet::make_sampler(linear_linear, *wrap_mode,
SamplerSet::make_sampler(linear_nearest, *wrap_mode, FilterMode::Linear, FilterMode::Linear); FilterMode::Linear, FilterMode::Linear);
SamplerSet::make_sampler(nearest_linear, *wrap_mode, FilterMode::Nearest, FilterMode::Linear); SamplerSet::make_sampler(linear_nearest, *wrap_mode,
SamplerSet::make_sampler(nearest_linear, *wrap_mode, FilterMode::Nearest, FilterMode::Nearest); FilterMode::Linear, FilterMode::Nearest);
SamplerSet::make_sampler(nearest_linear, *wrap_mode,
FilterMode::Nearest, FilterMode::Linear);
SamplerSet::make_sampler(nearest_nearest, *wrap_mode,
FilterMode::Nearest, FilterMode::Nearest);
samplers.insert((*wrap_mode, FilterMode::Linear, FilterMode::Linear), linear_linear); samplers.insert((*wrap_mode, FilterMode::Linear, FilterMode::Linear), linear_linear);
samplers.insert((*wrap_mode, FilterMode::Linear, FilterMode::Nearest), linear_nearest); samplers.insert((*wrap_mode, FilterMode::Linear, FilterMode::Nearest), linear_nearest);