Use RGBA as the default format for effect render targets

[libs/gl.git] / source / effects / sky.cpp

diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index 0744e7b9adaacda6b02be7cfaf775e9a53e97600..fc6d49fd37385e908ca57e4480b1ec61f6190e8f 100644 (file)
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -13,13 +13,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sky::Sky(Renderable &r, DirectionalLight &s):
-       Effect(r),
+Sky::Sky(Renderable &c, DirectionalLight &s):
+       Effect(c),
        sun(s),
-       transmittance_lookup(128, 64, (COLOR_ATTACHMENT,RGB16F)),
+       transmittance_lookup(128, 64, (COLOR_ATTACHMENT,RGBA16F)),
        transmittance_shprog(Resources::get_global().get<Program>("_sky_transmittance.glsl.shader")),
        transmittance_lookup_dirty(true),
-       distant(256, 128, (COLOR_ATTACHMENT,RGB16F)),
+       distant(256, 128, (COLOR_ATTACHMENT,RGBA16F)),
        distant_shprog(Resources::get_global().get<Program>("_sky_distant.glsl.shader")),
        fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
        backdrop_shprog(Resources::get_global().get<Program>("_sky_backdrop.glsl.shader")),
@@ -116,7 +116,7 @@ void Sky::setup_frame(Renderer &renderer)
        renderer.set_texture("transmittance_lookup", &transmittance_lookup.get_target_texture(0), &sampler);
        fullscreen_mesh.draw(renderer);
 
-       renderable.setup_frame(renderer);
+       content.setup_frame(renderer);
 }
 
 void Sky::finish_frame()
@@ -124,13 +124,13 @@ void Sky::finish_frame()
        if(rendered)
        {
                rendered = false;
-               renderable.finish_frame();
+               content.finish_frame();
        }
 }
 
 void Sky::render(Renderer &renderer, Tag tag) const
 {
-       renderable.render(renderer, tag);
+       content.render(renderer, tag);
 
        if(!is_enabled_for_method(tag))
                return;