diff options
| -rw-r--r-- | intern/cycles/device/device.cpp | 13 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 13 |
2 files changed, 8 insertions, 18 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 3a33b8fb68b..839f35116fa 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -83,24 +83,19 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dy, int w draw_params.bind_display_space_shader_cb(); } - glPushMatrix(); - glTranslatef(0.0f, (float)dy, 0.0f); - glBegin(GL_QUADS); glTexCoord2f(0.0f, 0.0f); - glVertex2f(0.0f, 0.0f); + glVertex2f(0.0f, dy); glTexCoord2f(1.0f, 0.0f); - glVertex2f((float)width, 0.0f); + glVertex2f((float)width, dy); glTexCoord2f(1.0f, 1.0f); - glVertex2f((float)width, (float)height); + glVertex2f((float)width, (float)height + dy); glTexCoord2f(0.0f, 1.0f); - glVertex2f(0.0f, (float)height); + glVertex2f(0.0f, (float)height + dy); glEnd(); - glPopMatrix(); - if(draw_params.unbind_display_space_shader_cb) { draw_params.unbind_display_space_shader_cb(); } diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 04319ba4775..42d4f8e48ff 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -918,24 +918,19 @@ public: draw_params.bind_display_space_shader_cb(); } - glPushMatrix(); - glTranslatef(0.0f, (float)dy, 0.0f); - glBegin(GL_QUADS); glTexCoord2f(0.0f, 0.0f); - glVertex2f(0.0f, 0.0f); + glVertex2f(0.0f, dy); glTexCoord2f((float)w/(float)pmem.w, 0.0f); - glVertex2f((float)width, 0.0f); + glVertex2f((float)width, dy); glTexCoord2f((float)w/(float)pmem.w, (float)h/(float)pmem.h); - glVertex2f((float)width, (float)height); + glVertex2f((float)width, (float)height + dy); glTexCoord2f(0.0f, (float)h/(float)pmem.h); - glVertex2f(0.0f, (float)height); + glVertex2f(0.0f, (float)height + dy); glEnd(); - glPopMatrix(); - if(draw_params.unbind_display_space_shader_cb) { draw_params.unbind_display_space_shader_cb(); } |