[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49142] branches/soc-2011-tomato/intern/ cycles/device/device_cuda.cpp: Correction to own previous commit
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 23 15:56:30 CEST 2012
Revision: 49142
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49142
Author: nazgul
Date: 2012-07-23 13:56:30 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Correction to own previous commit
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
Modified: branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2012-07-23 13:51:29 UTC (rev 49141)
+++ branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2012-07-23 13:56:30 UTC (rev 49142)
@@ -531,6 +531,8 @@
cuda_assert(cuFuncSetBlockShape(cuPathTrace, xthreads, ythreads, 1))
cuda_assert(cuLaunchGrid(cuPathTrace, xblocks, yblocks))
+ cuda_assert(cuCtxSynchronize())
+
cuda_pop_context();
}
@@ -840,10 +842,6 @@
}
path_trace(tile, sample);
-
- cuda_push_context();
- cuda_assert(cuCtxSynchronize())
- cuda_pop_context();
}
task->release_tile(tile);
More information about the Bf-blender-cvs
mailing list