Blender Git Statistics -> Branches -> soc-2014-viewport_fx

"Soc-2014-viewport_fx" branch

Total commits : 42
Total committers : 2
First Commit : June 7, 2014
Latest Commit : September 8, 2014


Commits by Month

DateNumber of Commits
September, 20142
August, 20140
July, 201419
June, 201421

Committers

AuthorNumber of Commits
Jason Wilkins40
Antony Riakiotakis2

Popular Files

FilenameTotal Edits
CMakeLists.txt7
GHOST_ContextCGL.mm6
GHOST_Window.cpp5
GHOST_ContextWGL.cpp5
GHOST_ContextCGL.h5
GHOST_Context.h5
GHOST_ContextEGL.cpp5
GHOST_ContextEGL.h5
GHOST_Window.h5
gpu_extensions.c4

Latest commits Feed

September 8, 2014, 16:15 (GMT)
Merge branch 'master' into soc-2014-viewport_fx

I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.

Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt
September 8, 2014, 13:33 (GMT)
Fix compilation on linux (Ubuntu 14.04 used here).
July 10, 2014, 23:18 (GMT)
Merge remote-tracking branch 'origin' into soc-2014-viewport_fx

Conflicts:
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
July 10, 2014, 22:59 (GMT)
need to call releaseNativeHandles in GHOST_WindowX11's destructor, as well as some additional checks in GHOST_ContextGLX's destructor
July 10, 2014, 13:34 (GMT)
fix initial window size being too large for OSX/X11 on multiple monitors (check for X11 being used instead of not APPLE and not WIN32)
July 10, 2014, 12:29 (GMT)
oops, some typos made it into the GLX context commit
July 10, 2014, 12:17 (GMT)
removed some accidentally added backup files
July 10, 2014, 02:30 (GMT)
Merge branch 'soc-2014-viewport_fx' of git.blender.org:blender into soc-2014-viewport_fx
July 9, 2014, 23:19 (GMT)
[Revision] GHOST Context Refactor for X11 (Also can compile GHOST X11 on OSX)
This is much like the CGL context in that it is fairly preliminary and does not have all the features of EGL or WGL contexts yet.
In order to work on this on OSX, some minor changes were made to CMake to link with X11 on OSX
July 9, 2014, 23:13 (GMT)
some readability edits for ghost context classes
also added code to clear screen immediately after context creation, similar to how it is done for glX
July 9, 2014, 23:06 (GMT)
removed apparent overly verbose conversion of int to bool in GHOST_C-api.cpp
July 9, 2014, 23:03 (GMT)
fix: xdnd module did not compile on OSX without setting the location of X11 include files
July 9, 2014, 22:56 (GMT)
Moved and deleted some code from GHOST Cocoa
moved locale query to the intern/locale module
deleted some odd code that did not appear to be actually used relating to command line arguments
July 4, 2014, 20:15 (GMT)
[OpenGL Policy] BlendFuncSeparate defaults to GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO

Only set the blend func if the coefficients are different. Return them to the defaults when done.

Note: Fairly confident that Blender and the standalone Cycles renderer are correct, but that both the embedded and standalone game engine will need more testing.

Note: Do we actually want the default to be: GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA?
July 4, 2014, 16:58 (GMT)
Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx
July 4, 2014, 16:57 (GMT)
OpenGL Extension Shims

A few things are going on with these "shims":
* OpenGL 2.0 and GLEW_ARB_shader_objects are subtly different.
* Some extensions come in ARB and OES flavors.
* GenerateMipmaps needs a workaround on ATI.
* gpu_buffer_start_update and gpu_buffer_finish_update make usage of buffer objects a bit more abstract

Any use of a shimmed function directly without the shim is caught by GPU_deprecated.h

There are also some other changes that are not related to shims that came along for the ride.
July 4, 2014, 16:40 (GMT)
Made a mistake when rewriting GPU_material_construct_end to return bool.
July 4, 2014, 16:38 (GMT)
#if 0'd out all of GPU_deprecated.h and turned on GPU_MANGLE_DEPRECATED by default.

Will add functions and symbols back as work progresses.

Since bgl.c uses OpenGL directly like source/blender/gpu, it disables GPU_MANGLE_DEPRECATED.
July 4, 2014, 16:30 (GMT)
Added getNumOfAASamples to GHOST_IWindow interface.

I was going to use it for something, but decided to use glGetIntegerv(GL_SAMPLES, &i) instead.
It may be the case that neither this nor stereoVisual should be cached.
July 1, 2014, 09:12 (GMT)
Fixed documentation of GHOST_GetSwapInterval to match new interface

MiikaHweb - Blender Git Statistics v1.06
By: Miika HämäläinenLast update: Nov-07-2014 14:18 MiikaHweb | 2003-2019