[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58327] branches/soc-2013-viewport_fx: Merged work from working copy of GSoC 2012 work into GSoC 2013 branch.
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Jul 17 09:54:21 CEST 2013
Revision: 58327
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58327
Author: jwilkins
Date: 2013-07-17 07:54:20 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Merged work from working copy of GSoC 2012 work into GSoC 2013 branch.
Compiles w/ Visual Studio 2012 but not thoroughly tested.
Still need double check for any merge "fuzz"
Modified Paths:
--------------
branches/soc-2013-viewport_fx/CMakeLists.txt
branches/soc-2013-viewport_fx/build_files/cmake/macros.cmake
branches/soc-2013-viewport_fx/extern/CMakeLists.txt
branches/soc-2013-viewport_fx/extern/glew/CMakeLists.txt
branches/soc-2013-viewport_fx/intern/cycles/app/CMakeLists.txt
branches/soc-2013-viewport_fx/intern/cycles/device/CMakeLists.txt
branches/soc-2013-viewport_fx/intern/cycles/device/device.cpp
branches/soc-2013-viewport_fx/intern/cycles/device/device_cuda.cpp
branches/soc-2013-viewport_fx/intern/cycles/util/CMakeLists.txt
branches/soc-2013-viewport_fx/intern/ghost/CMakeLists.txt
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2013-viewport_fx/source/blender/blenfont/BLF_api.h
branches/soc-2013-viewport_fx/source/blender/blenfont/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/blenfont/SConscript
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_dir.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal.h
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_translation.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/anim.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/group.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_fileops.h
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_fileops_types.h
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_winstuff.h
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/fileops.c
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/storage.c
branches/soc-2013-viewport_fx/source/blender/blenloader/BLO_readfile.h
branches/soc-2013-viewport_fx/source/blender/blenloader/intern/runtime.c
branches/soc-2013-viewport_fx/source/blender/datatoc/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/animation/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_markers.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/armature/armature_naming.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/armature_relations.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/armature_select.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/pose_lib.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/reeb.c
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-viewport_fx/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_node.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_view3d.h
branches/soc-2013-viewport_fx/source/blender/editors/include/UI_resources.h
branches/soc-2013-viewport_fx/source/blender/editors/interface/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_icons.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_ops.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_panel.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_regions.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/resources.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/view2d.c
branches/soc-2013-viewport_fx/source/blender/editors/mask/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/mask/mask_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editface.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-viewport_fx/source/blender/editors/object/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/physics/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/physics/particle_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/render/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/render/render_internal.c
branches/soc-2013-viewport_fx/source/blender/editors/render/render_opengl.c
branches/soc-2013-viewport_fx/source/blender/editors/render/render_preview.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/screen/area.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/glutil.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screen_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screendump.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_action/action_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_action/space_action.c
branches/soc-2013-viewport_fx/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-viewport_fx/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_console/console_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_console/space_console.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_file/file_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/space_file.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_image/image_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/space_image.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_info/info_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/space_info.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/textview.c
branches/soc-2013-viewport_fx/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_logic/logic_window.c
branches/soc-2013-viewport_fx/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_node/drawnode.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/node_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-viewport_fx/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_script/space_script.c
branches/soc-2013-viewport_fx/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_text/space_text.c
branches/soc-2013-viewport_fx/source/blender/editors/space_text/text_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_time/space_time.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform.h
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_generics.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_snap.c
branches/soc-2013-viewport_fx/source/blender/editors/util/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/util/ed_util.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_extensions.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-viewport_fx/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-viewport_fx/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-viewport_fx/source/blender/python/generic/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/windowmanager/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/windowmanager/WM_api.h
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-viewport_fx/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2013-viewport_fx/source/tools/GL/core.gl
branches/soc-2013-viewport_fx/source/tools/GL/deprecated.gl
branches/soc-2013-viewport_fx/source/tools/GL/extensions.gl
branches/soc-2013-viewport_fx/source/tools/GL/glreport.py
branches/soc-2013-viewport_fx/source/tools/GL/libraries.gl
Added Paths:
-----------
branches/soc-2013-viewport_fx/extern/glew-es/
branches/soc-2013-viewport_fx/extern/glew-es/CMakeLists.txt
branches/soc-2013-viewport_fx/extern/glew-es/SConscript
branches/soc-2013-viewport_fx/extern/glew-es/include/
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/eglew.h
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glesew.h
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glxew.h
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/wglew.h
branches/soc-2013-viewport_fx/extern/glew-es/src/
branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextAGL.cpp
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextAGL.h
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextCGL.h
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextCGL.mm
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextEGL.cpp
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextEGL.h
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextWGL.cpp
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextWGL.h
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextXGL.cpp
branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_ContextXGL.h
branches/soc-2013-viewport_fx/source/blender/editors/armature/editarmature.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_colors.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_compatibility.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_functions.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_matrix.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_object.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_primitives.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_debug.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_deprecated.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_functions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_glew.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_glsl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_internal.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_vbo.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_glsl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_internal.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_matrix.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gles.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gles.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_primitives.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_primitives_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.h
branches/soc-2013-viewport_fx/source/creator/buildinfo.h.rule
branches/soc-2013-viewport_fx/source/tools/GL/blender.gl
branches/soc-2013-viewport_fx/source/tools/GL/gpucov.py
Removed Paths:
-------------
branches/soc-2013-viewport_fx/source/blender/editors/include/BIF_gl.h
Modified: branches/soc-2013-viewport_fx/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/CMakeLists.txt 2013-07-17 05:38:51 UTC (rev 58326)
+++ branches/soc-2013-viewport_fx/CMakeLists.txt 2013-07-17 07:54:20 UTC (rev 58327)
@@ -294,6 +294,53 @@
mark_as_advanced(WITH_GCC_MUDFLAP)
endif()
+# OpenGL
+
+option(WITH_GL_EXPERIMENTAL_GLEW "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
+mark_as_advanced(WITH_GL_EXPERIMENTAL_GLEW)
+
+option(WITH_GL_SYSTEM_LEGACY "Support using AGL/WGL/XGL system library (without extensions) to initialize OpenGL. Can only access pre 3.1 'legacy' profile. (deprecated)" ON)
+mark_as_advanced(WITH_GL_SYSTEM_LEGACY)
+
+option(WITH_GL_SYSTEM_DESKTOP "Support using the AGL/WGL/XGL system library to initialize OpenGL. Can access 3.1+ core, compatibility, and 2.0 es profiles." OFF)
+mark_as_advanced(WITH_GL_SYSTEM_DESKTOP)
+
+option(WITH_GL_SYSTEM_EMBEDDED "Support using the EGL system library to initialize OpenGL ES." OFF)
+mark_as_advanced(WITH_GL_SYSTEM_EMBEDDED)
+
+option(WITH_GL_PROFILE_COMPATIBILITY "Support using the OpenGL 'compatibility' profile. (deprecated)" ON)
+mark_as_advanced(WITH_GL_PROFILE_COMPATIBILITY)
+
+option(WITH_GL_PROFILE_CORE "Support using the OpenGL 3.1+ 'core' profile." OFF)
+mark_as_advanced(WITH_GL_PROFILE_CORE)
+
+option(WITH_GL_PROFILE_ES20 "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)" OFF)
+mark_as_advanced(WITH_GL_PROFILE_ES20)
+
+option(WITH_GPU_SAFETY "Perform extensive runtime tests to catch certain graphics API usage errors. (degrades performance)" OFF)
+mark_as_advanced(WITH_GPU_SAFETY)
+
+if(WIN32)
+ option(WITH_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
+
+ # ToDo: Add ANGLE to the lib directory
+ set(ANGLE_INCLUDE_PATH "" CACHE PATH "Path to ANGLE include files")
+ set(ANGLE_LIBRARY "" CACHE PATH "Path to ANGLE library file")
+
+ mark_as_advanced(
+ WITH_ANGLE
+ ANGLE_INCLUDE_PATH
+ ANGLE_LIBRARY
+ )
+endif()
+
+# Code Coverage
+
+option(WITH_CODE_COVERAGE "Compile with support for generating code coverage information" OFF)
+mark_as_advanced(WITH_CODE_COVERAGE)
+
+# Apple
+
if(APPLE)
cmake_minimum_required(VERSION 2.8.8)
cmake_policy(VERSION 2.8.8)
@@ -1902,11 +1949,64 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
-find_package(OpenGL)
-blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
-# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
-# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
+if(WITH_GL_SYSTEM_EMBEDDED AND (WITH_GL_SYSTEM_LEGACY OR WITH_GL_SYSTEM_DESKTOP))
+ message(FATAL_ERROR "WITH_GL_SYSTEM_EMBEDDED cannot be used at the same time as WITH_GL_SYSTEM_LEGACY or WITH_GL_SYSTEM_DESKTOP")
+endif()
+
+if(WITH_GL_SYSTEM_EMBEDDED)
+ if(WITH_ANGLE)
+ set(ANGLE_INCLUDE_DIR "" CACHE PATH "Path to ANGLE include files")
+ set(ANGLE_LIBRARY "" CACHE FILEPATH "ANGLE library file")
+
+ mark_as_advanced(
+ ANGLE_INCLUDE_DIR
+ ANGLE_LIBRARY
+ )
+
+ set(SYSTEM_GL_INCLUDE_DIR "${ANGLE_INCLUDE_DIR}")
+ set(SYSTEM_GL_LIBRARIES "${ANGLE_LIBRARY}")
+ else()
+ set(OPENGLES_INCLUDE_DIR "" CACHE PATH "Path to OpenGL ES include files")
+ set(OPENGLES_LIBRARIES "" CACHE FILEPATH "OpenGL ES library file")
+
+ mark_as_advanced(
+ OPENGLES_INCLUDE_DIR
+ OPENGLES_LIBRARY
+ )
+
+ set(SYSTEM_GL_INCLUDE_DIR "${OPENGLES_INCLUDE_DIR}")
+ set(SYSTEM_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+ endif()
+else(WITH_GL_SYSTEM_LEGACY OR WITH_GL_SYSTEM_DESKTOP)
+ find_package(OpenGL)
+
+ set(SYSTEM_GL_INCLUDE_DIR "${OPENGL_INCLUDE_DIR}")
+ set(SYSTEM_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+
+ if(WITH_GL_SYSTEM_LEGACY)
+ list(APPEND SYSTEM_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
+ endif()
+endif()
+
+blender_include_dirs_sys("${SYSTEM_GL_INCLUDE_DIR}")
+
+if(WITH_GL_PROFILE_COMPATIBILITY)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DWITH_GL_PROFILE_COMPATIBILITY")
+endif()
+
+if(WITH_GL_PROFILE_CORE)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DWITH_GL_PROFILE_CORE")
+endif()
+
+if(WITH_GL_PROFILE_ES20)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DWITH_GL_PROFILE_ES20")
+endif()
+
+if(WITH_GPU_SAFETY)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DWITH_GPU_SAFETY")
+endif()
+
#-----------------------------------------------------------------------------
# Configure OpenMP.
if(WITH_OPENMP)
@@ -1943,11 +2043,32 @@
GLEW_INCLUDE_PATH
)
else()
- # set(GLEW_LIBRARY "") # unused
- set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DGLEW_STATIC")
+
+ if(WITH_GL_EXPERIMENTAL_GLEW)
+ set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")
+
+ # this isn't strictly required, but potentally makes GLEW smaller and helps catch unguarded API usage
+ if(NOT WITH_GL_PROFILE_ES20)
+ # no es functions are needed
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DGLEW_NO_ES")
+ elseif(NOT (WITH_GL_PROFILE_CORE OR WITH_GL_PROFILE_COMPATIBILITY))
+ # es is enabled, but the other functions are all disabled
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DGLEW_ES_ONLY")
+ endif()
+
+ if (WITH_GL_PROFILE_ES20)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DGLEW_USE_LIB_ES2_0")
+ endif()
+
+ if(WITH_GL_SYSTEM_EMBEDDED)
+ set(GL_DEFINITIONS "${GL_DEFINITIONS} -DGLEW_INC_EGL")
+ endif()
+ else()
+ set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+ endif()
endif()
-
#-----------------------------------------------------------------------------
# Configure Bullet
@@ -2155,6 +2276,18 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_ERROR_MUDFLAP -Wno-error=mudflap)
endif()
+#-----------------------------------------------------------------------------
+# Code Coverage
+if(WITH_CODE_COVERAGE)
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fprofile-arcs -ftest-coverage")
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -fprofile-arcs -ftest-coverage")
+
+ if(CMAKE_COMPILER_IS_GNUCC)
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lgcov")
+ endif()
+endif()
+
+#-----------------------------------------------------------------------------
# Include warnings first, so its possible to disable them with user defined flags
# eg: -Wno-uninitialized
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
@@ -2290,6 +2423,19 @@
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
+ info_cfg_text("OpenGL:")
+ info_cfg_option(WITH_GL_EXPERIMENTAL_GLEW)
+ info_cfg_option(WITH_GL_SYSTEM_LEGACY)
+ info_cfg_option(WITH_GL_SYSTEM_DESKTOP)
+ info_cfg_option(WITH_GL_SYSTEM_EMBEDDED)
+ info_cfg_option(WITH_GL_PROFILE_COMPATIBILITY)
+ info_cfg_option(WITH_GL_PROFILE_CORE)
+ info_cfg_option(WITH_GL_PROFILE_ES20)
+ info_cfg_option(WITH_GPU_SAFETY)
+ if(WIN32)
+ info_cfg_option(WITH_ANGLE)
+ endif()
+
# debug
message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
Modified: branches/soc-2013-viewport_fx/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-viewport_fx/build_files/cmake/macros.cmake 2013-07-17 05:38:51 UTC (rev 58326)
+++ branches/soc-2013-viewport_fx/build_files/cmake/macros.cmake 2013-07-17 07:54:20 UTC (rev 58327)
@@ -261,8 +261,7 @@
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
target_link_libraries(${target}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
+ ${SYSTEM_GL_LIBRARIES}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
${FREETYPE_LIBRARY})
@@ -336,9 +335,11 @@
endif()
if(WITH_CODEC_FFMPEG)
- # Strange!, without this ffmpeg gives linking errors (on linux)
- # even though its linked above
- target_link_libraries(${target} ${OPENGL_glu_LIBRARY})
+ # Strange! Without this ffmpeg gives linking errors (on linux),
+ # even though it's linked above.
+ if (WITH_GL_SYSTEM_LEGACY)
+ target_link_libraries(${target} ${OPENGL_glu_LIBRARY})
+ endif()
target_link_libraries(${target} ${FFMPEG_LIBRARIES})
endif()
Modified: branches/soc-2013-viewport_fx/extern/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/extern/CMakeLists.txt 2013-07-17 05:38:51 UTC (rev 58326)
+++ branches/soc-2013-viewport_fx/extern/CMakeLists.txt 2013-07-17 07:54:20 UTC (rev 58327)
@@ -47,7 +47,11 @@
endif()
if(NOT WITH_SYSTEM_GLEW)
- add_subdirectory(glew)
+ if(WITH_GL_EXPERIMENTAL_GLEW)
+ add_subdirectory(glew-es)
+ else()
+ add_subdirectory(glew)
+ endif()
endif()
if(WITH_GAMEENGINE)
Modified: branches/soc-2013-viewport_fx/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew/CMakeLists.txt 2013-07-17 05:38:51 UTC (rev 58326)
+++ branches/soc-2013-viewport_fx/extern/glew/CMakeLists.txt 2013-07-17 07:54:20 UTC (rev 58327)
@@ -45,6 +45,6 @@
include/GL/wglew.h
)
-add_definitions(-DGLEW_STATIC)
+add_definitions(${GL_DEFINITIONS})
blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
Added: branches/soc-2013-viewport_fx/extern/glew-es/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/CMakeLists.txt (rev 0)
+++ branches/soc-2013-viewport_fx/extern/glew-es/CMakeLists.txt 2013-07-17 07:54:20 UTC (rev 58327)
@@ -0,0 +1,50 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2013, Blender Foundation
+# All rights reserved.
+#
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list