archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GLSL tweaks for viewport render draw

Browse Source 
- Was missing pixel scale
- Dither is now supported on GPU
This commit is contained in:
Sergey Sharybin
2014-06-20 18:10:32 +06:00
parent ca0c0e7549
commit 8937feadae
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/render/render_internal.c
View File

@@ -1432,19 +1432,18 @@ void render_view3d_draw(RenderEngine *engine, const bContext *C)
float scale_x = (float) ar->winx / rres.rectx; float scale_x = (float) ar->winx / rres.rectx;
float scale_y = (float) ar->winy / rres.recty; float scale_y = (float) ar->winy / rres.recty;
/* Dithering is not supported on GLSL yet */
force_fallback |= dither != 0.0f;
/* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */ /* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */
force_fallback |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL); force_fallback |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL);
/* Try using GLSL display transform. */ /* Try using GLSL display transform. */
if (force_fallback == false) { if (force_fallback == false) {
if (IMB_colormanagement_setup_glsl_draw(&scene->view_settings, &scene->display_settings, 0.0f, true)) { if (IMB_colormanagement_setup_glsl_draw(&scene->view_settings, &scene->display_settings, dither, true)) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glPixelZoom(scale_x, scale_y);
glaDrawPixelsTex(rres.xof, rres.yof, rres.rectx, rres.recty, GL_RGBA, GL_FLOAT, glaDrawPixelsTex(rres.xof, rres.yof, rres.rectx, rres.recty, GL_RGBA, GL_FLOAT,
GL_NEAREST, rres.rectf); GL_NEAREST, rres.rectf);
glPixelZoom(1.0f, 1.0f);
glDisable(GL_BLEND); glDisable(GL_BLEND);
IMB_colormanagement_finish_glsl_draw(); IMB_colormanagement_finish_glsl_draw();