[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59694] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Aug 31 21:37:25 CEST 2013
Revision: 59694
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59694
Author: gdh
Date: 2013-08-31 19:37:25 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59672 to r59693.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59672
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59693
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_cpu.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_cuda.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_memory.h
branches/soc-2013-cycles_mblur/intern/cycles/device/device_multi.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_network.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_network.h
branches/soc-2013-cycles_mblur/intern/cycles/device/device_opencl.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_task.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_task.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cu
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_film.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/buffers.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/buffers.h
branches/soc-2013-cycles_mblur/intern/cycles/render/session.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/session.h
branches/soc-2013-cycles_mblur/intern/cycles/util/util_task.cpp
branches/soc-2013-cycles_mblur/intern/cycles/util/util_task.h
branches/soc-2013-cycles_mblur/intern/cycles/util/util_types.h
branches/soc-2013-cycles_mblur/intern/opencolorio/fallback_impl.cc
branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_capi.cc
branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_capi.h
branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_impl.h
branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/glutil.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_geometry.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59671
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59693
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-31 19:37:25 UTC (rev 59694)
@@ -882,8 +882,6 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-31 19:37:25 UTC (rev 59694)
@@ -387,7 +387,7 @@
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
- target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
endmacro()
macro(TEST_SSE_SUPPORT
Modified: branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt 2013-08-31 19:37:25 UTC (rev 59694)
@@ -14,8 +14,13 @@
if(WIN32 AND MSVC)
# there is no /arch:SSE3, but intrinsics are available anyway
- set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
- set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ if(CMAKE_CL_64)
+ set(CYCLES_SSE2_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ set(CYCLES_SSE3_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ else()
+ set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-31 19:37:25 UTC (rev 59694)
@@ -20,13 +20,22 @@
cycles_subd
cycles_util
${BOOST_LIBRARIES}
+ ${OPENEXR_LIBRARIES}
${OPENGL_LIBRARIES}
${CYCLES_GLEW_LIBRARY}
${OPENIMAGEIO_LIBRARIES}
+ ${PNG_LIBRARIES}
+ ${JPEG_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${TIFF_LIBRARY}
)
-link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
+if(WIN32)
+ list(APPEND LIBRARIES ${PTHREADS_LIBRARIES})
+endif()
+link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH} ${PNG_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH})
+
if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
list(APPEND LIBRARIES ${GLUT_LIBRARIES})
endif()
@@ -45,7 +54,7 @@
cycles_xml.h
)
add_executable(cycles ${SRC})
- target_link_libraries(cycles ${LIBRARIES})
+ target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS})
if(UNIX AND NOT APPLE)
set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-08-31 19:37:25 UTC (rev 59694)
@@ -959,7 +959,7 @@
sub = col.row(align=True)
sub.active = cworld.sample_as_light
sub.prop(cworld, "sample_map_resolution")
- if not cscene.progressive:
+ if cscene.progressive == 'BRANCHED_PATH':
sub.prop(cworld, "samples")
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp 2013-08-31 19:37:25 UTC (rev 59694)
@@ -588,7 +588,15 @@
/* draw */
BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_scene, b_v3d, b_rv3d, scene->camera, width, height);
- return !session->draw(buffer_params);
+ if(session->params.display_buffer_linear)
+ b_engine.bind_display_space_shader(b_scene);
+
+ bool draw_ok = !session->draw(buffer_params);
+
+ if(session->params.display_buffer_linear)
+ b_engine.unbind_display_space_shader();
+
+ return draw_ok;
}
void BlenderSession::get_status(string& status, string& substatus)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp 2013-08-31 19:37:25 UTC (rev 59694)
@@ -494,6 +494,9 @@
params.shadingsystem = SessionParams::SVM;
else if(shadingsystem == 1)
params.shadingsystem = SessionParams::OSL;
+
+ /* color managagement */
+ params.display_buffer_linear = b_engine.support_display_space_shader(b_scene);
return params;
}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp 2013-08-31 16:36:54 UTC (rev 59693)
+++ branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp 2013-08-31 19:37:25 UTC (rev 59694)
@@ -41,7 +41,10 @@
void Device::pixels_copy_from(device_memory& mem, int y, int w, int h)
{
- mem_copy_from(mem, y, w, h, sizeof(uint8_t)*4);
+ if(mem.data_type == TYPE_HALF)
+ mem_copy_from(mem, y, w, h, sizeof(half4));
+ else
+ mem_copy_from(mem, y, w, h, sizeof(uchar4));
}
void Device::pixels_free(device_memory& mem)
@@ -53,27 +56,49 @@
{
pixels_copy_from(rgba, y, w, h);
+ GLuint texid;
+ glGenTextures(1, &texid);
+ glBindTexture(GL_TEXTURE_2D, texid);
+ if(rgba.data_type == TYPE_HALF)
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, (void*)rgba.data_pointer);
+ else
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (void*)rgba.data_pointer);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ glEnable(GL_TEXTURE_2D);
+
if(transparent) {
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
}
- glPixelZoom((float)width/(float)w, (float)height/(float)h);
- glRasterPos2f(0, dy);
+ glColor3f(1.0f, 1.0f, 1.0f);
- uint8_t *pixels = (uint8_t*)rgba.data_pointer;
+ glPushMatrix();
+ glTranslatef(0.0f, (float)dy, 0.0f);
- /* for multi devices, this assumes the ineffecient method that we allocate
- * all pixels on the device even though we only render to a subset */
- pixels += 4*y*w;
+ glBegin(GL_QUADS);
+
+ glTexCoord2f(0.0f, 0.0f);
+ glVertex2f(0.0f, 0.0f);
+ glTexCoord2f(1.0f, 0.0f);
+ glVertex2f((float)width, 0.0f);
+ glTexCoord2f(1.0f, 1.0f);
+ glVertex2f((float)width, (float)height);
+ glTexCoord2f(0.0f, 1.0f);
+ glVertex2f(0.0f, (float)height);
- glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+ glEnd();
- glRasterPos2f(0.0f, 0.0f);
- glPixelZoom(1.0f, 1.0f);
+ glPopMatrix();
if(transparent)
glDisable(GL_BLEND);
+
+ glBindTexture(GL_TEXTURE_2D, 0);
+ glDisable(GL_TEXTURE_2D);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list