Use a default sampler in Renderer if null was passed in

[libs/gl.git] / source / render / renderer.cpp

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 2b1503ce23c847b025b75325e2b7e2cb13960a53..98246da7fb6c7d42bd17dfc0c78f2ad3444b8dc3 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -25,7 +25,8 @@ const Tag Renderer::world_obj_matrix_tag("world_obj_matrix");
 const Tag Renderer::world_obj_normal_matrix_tag("world_obj_normal_matrix");
 
 Renderer::Renderer():
-       placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png"))
+       placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png")),
+       default_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp"))
 {
        state_stack.reserve(16);
        shdata_stack.reserve(32);
@@ -171,7 +172,11 @@ void Renderer::set_texture(Tag tag, const Texture *tex, int level, const Sampler
                        res_mgr->resource_used(*tex);
                if(!tex->is_loaded())
                        tex = &placeholder_texture;
+               if(!samp)
+                       samp = &default_sampler;
        }
+       else
+               samp = 0;
 
        if(texture_stack.size()>state.texture_count)
        {
@@ -362,7 +367,7 @@ void Renderer::apply_state()
        if(changed&MATRIX)
        {
                standard_shdata.uniform(world_obj_matrix_tag, state.model_matrix);
-               LinAl::SquareMatrix<float, 3> nm = state.model_matrix.block<3, 3>(0, 0);
+               LinAl::Matrix<float, 3, 3> nm = state.model_matrix.block<3, 3>(0, 0);
                nm = transpose(invert(nm));
                standard_shdata.uniform(world_obj_normal_matrix_tag, nm);
                changed &= ~MATRIX;