diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-11 17:40:38 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-11 17:41:18 +0300 |
commit | 4fc31881127786f244bc67ad45b3787c6d7917a2 (patch) | |
tree | 7577345458bd5ec6fedaf0050c915ec1ed5125b0 /intern/cycles/device/device_cuda.cpp | |
parent | d30f664c0438e8378c79d5beb114b1338d0e1d94 (diff) |
Cycles: Get rid of one more OpenGL matrix manipulation/push/pop.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index be6a1f3502d..4b325947f0f 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -880,7 +880,7 @@ public: } } - void draw_pixels(device_memory& mem, int y, int w, int h, int dy, int width, int height, bool transparent, + void draw_pixels(device_memory& mem, int y, int w, int h, int dx, int dy, int width, int height, bool transparent, const DeviceDrawParams &draw_params) { if(!background) { @@ -932,22 +932,22 @@ public: /* texture coordinate - vertex pair */ vpointer[0] = 0.0f; vpointer[1] = 0.0f; - vpointer[2] = 0.0f; + vpointer[2] = dx; vpointer[3] = dy; vpointer[4] = (float)w/(float)pmem.w; vpointer[5] = 0.0f; - vpointer[6] = (float)width; + vpointer[6] = (float)width + dx; vpointer[7] = dy; vpointer[8] = (float)w/(float)pmem.w; vpointer[9] = (float)h/(float)pmem.h; - vpointer[10] = (float)width; + vpointer[10] = (float)width + dx; vpointer[11] = (float)height + dy; vpointer[12] = 0.0f; vpointer[13] = (float)h/(float)pmem.h; - vpointer[14] = 0.0f; + vpointer[14] = dx; vpointer[15] = (float)height + dy; glUnmapBuffer(GL_ARRAY_BUFFER); @@ -981,7 +981,7 @@ public: return; } - Device::draw_pixels(mem, y, w, h, dy, width, height, transparent, draw_params); + Device::draw_pixels(mem, y, w, h, dx, dy, width, height, transparent, draw_params); } void thread_run(DeviceTask *task) |