Blender Git Commits

Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

Accidentally committed some backup copies of some files in gpu.

Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

Merge branch 'soc-2014-viewport_fx' of git.blender.org:blender into soc-2014-viewport_fx

Some changes to OSX GHOST contexts got left out of previous separation of wanted parameters and actual parameters

(Showing My Work) Expanded GPU Module to Support Modern OpenGL

I am updating the GPU module so that it contains code needed for Blender to support a programmable shader based pipeline.

In an effort to make sure things always compile I've excluded most of the changes from 2013 that were made to gpu_codegen, gpu_draw, gpu_extensions, and gpu_material.

This new functionality is not used anywhere in Blender yet. That will come gradually.

This is a bit rough because I wanted something in the repository before evaluations. I wanted to break this into smaller more manageable pieces for code review, but that would take too much time. However, this might still work for review purposes.

Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

Conflicts:
CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp

(Revision 1) New Matrix and Vector Operations for Viewport FX

Addressed concerns:
"Using const with multi-dimensional arrays gives warnings in GCC/Clang"
"This so short that I dont think its even copyrightable, (cross product and some assignments)"
"all other functions have mul_ prefix. why difference?"

I also cleaned up some whitespace.

Have not addressed concerns about the name of scale_m4 or the generality/compatibility of translate_m4.

Revert "BLI_restrict macro to help the compiler optimize functions that do not allow pointer aliasing."

This reverts commit 9e402f8866794eadd49e5a024bed532ab6cf7b19.

Fix for MSVC where __func__ is not defined unless you accidentally include BLI_compiler_compat.h

BLI_restrict macro to help the compiler optimize functions that do not allow pointer aliasing.

New Matrix and Vector Operations for Viewport FX

New functions required for emulation an OpenGL style matrix stack on the GPU
New functions that replace functionality provided by GLU
Some fixes to make various matrix and vector functions const correct
More efficient '_q' matrix functions that assume no pointer aliasing
A set of macros for initializing vector arrays (VEC2D, VEC3D, VEC4D)
2 and 4 dimensional versions of VECCOPY macro
Typo fix, ortho_v2_v2 formal parameter implied a 3 element array, instead of the proper 2

Using 0 as an error sentinel for the swap interval is not strictly correct.

0 is a valid value for a swap interval and different users of getSwapInterval may want to substitute different values if the swap interval cannot be read.

This commit changes the prototype to: GHOST_TSuccess getSwapInterval(int& intervalOut)

Users of the function should either check the return value or set intervalOut to a default value before calling getSwapInterval.

GHOST_ContextCGL

Initial pass at a re-factored OpenGL context for Cocoa.
This does not yet implement the same checks and warnings that the WGL and EGL contexts have.

Update of GHOST_ContextNone so that functions recently added to the interface have dummy implementations that are no-ops but still "succeed" at doing nothing (the defaults in GHOST_Context "fail" to do nothing)

Separation of desired stereo and multisample parameters from actual values along with some other fixes to GHOST

stereoVisual and numOfAASamples now stored in GHOST_Context
parameters for GHOST_Window renamed to wantStereoVisual and wantNumOfAASamples to reflect that context creation will try to satisfy the request, but not fail if it cannot.
The parameters in GHOST_Context hold the actual values that were initialized
added isValid to base GHOST_Window
added updateDrawingContext to GHOST_Context and GHOST_Window (However, it is only needed by OSX)
fixed typo: WGLEW_WGL_EXT_swap_control -> WGLEW_EXT_swap_control

The GLU library in BLENDER_GL_LIBRARIES was accidentally being replaced. Solution is to use list(APPEND) instead of set().

cleanup related to EGL contexts
added EGL 1.5 entry points to glew-es
glew-es was assuming that EGL and ES always go together, but you can use EGL to initialize non-ES contexts
moved swap interval implementation to GHOST_Context classes
added EGLDisplay parameter to EGLEWInit in order to work around ARM Mali bug (but seems sensible compared to other EGL functions)
more checks before calling eglBindAPI, no need if there is no EGL display

GHOST Refactor for EGL Contexts

Documentation to appear here:
http://wiki.blender.org/index.php/User:Jwilkins/VFX/GHOST_Refactor_for_EGL

Missing from this commit is support for systems other than Windows.
This also only builds with CMake.