[cogl] (177 commits) Non-fast-forward update to branch wip/cogl-1.14



The branch 'wip/cogl-1.14' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 http://live.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  abbc630... texture-rectangle: Make new_from_foreign api public
  977b6be... matrix: Add cogl_debug_matrix_print api
  316fef7... gitignore: Ignore the new and generated cogl-egl-defines.h
  8fe3675... build: Remove spurious Makefile.am
  b6b638c... renderer: Remove unused error from CoglRendererError
  dd93556... gitignore: Only ignore the README file at the root of the r
  bfc9879... core: Don't use g_once_*() API
  4c8d917... stb_image: Fix warnings that the original stb_image has
  714d916... build: Bump the glib dependency to 2.32
  db67dfb... Re-organize the source layout
  558e5b9... fix: texture-rectangle: Make new_from_foreign api public
  7c9e896... tests: Don't build test-journal with --disable-glib
  a6fc984... core: Don't initialize the GType system with --disable-glib
  18a32b8... build: Move the compiler checks and libtool initialization 
  7adb013... config: Don't read a config file at startup when using --di
  7b5e2ed... tests: Don't use g_test_verbose() as cogl doesn't use GTest
  445aa35... build: Indicate if cogl is build with i18n support
  4006985... build: Use the correct variable to indicate of cogl-gles2 w
  134c197... Adds CoglError api
  4724b74... build: Allow to build cogl without an external glib depende
  61f8b3e... Build: Add a --enable-standalone option
  fc861dd... build the sdl examples when glib is disabled
  173c901... build: Create the libtool file early as it's used by AS_GLI
  c7210b7... build: don't include deps/glib headers if glib enabled
  075796c... texture: rename texobj flush code as gl specific
  ecdc5f8... texture-2d: factor out all GL specific code
  871a262... blit: avoid using _COGL_GET_CONTEXT
  9287211... fix: texture-2d: factor out all GL specific code
  ed4e656... attribute: Split out GL specific code
  1238d61... Adds a NOP driver
  c41502a... clip-stack: Splits out opengl specific code
  cb6996d... buffer: move choice about using malloc closer to driver
  e87aa87... Give buffer/bitmap bind functions gl infix
  eb173bf... buffer: splits out GL specific code
  f87838f... fix: attribute: Split out GL specific code
  4143d77... fix: texture-2d: factor out all GL specific code
  f5c1da8... fix: attribute: Split out GL specific code
  fed5c6e... pipeline: remove dubious optimization
  eecfa85... pipeline: remove unused _MASK defines
  18a7cf5... pipeline: remove duplicate defines
  f84dbb8... pipeline: tidy up definition of *END defines
  8023f6f... Clearly define 3 progends that own the frag+vertends
  73bf490... Fix a warning in the vtable for texture_2d_get_data
  dc56e03... driver-gl: split out parse_gl_version function
  e31ebdc... check the glsl version during init
  7524136... add cogl-glsl-shader files to aid backporting patches

Commits added to the branch:

  0ffad6b... texture-rectangle: Make new_from_foreign api public
  1161870... matrix: Add cogl_debug_matrix_print api
  f4bb93d... gitignore: Ignore the new and generated cogl-egl-defines.h
  ab91bdf... build: Remove spurious Makefile.am
  c9fe28c... renderer: Remove unused error from CoglRendererError
  5ef579b... gitignore: Only ignore the README file at the root of the r
  24fa64b... core: Don't use g_once_*() API
  024a143... stb_image: Fix warnings that the original stb_image has
  0fdfde5... build: Bump the glib dependency to 2.32
  51adff5... Re-organize the source layout
  bf275db... tests: Don't build test-journal with --disable-glib
  6322fdf... core: Don't initialize the GType system with --disable-glib
  69ad30d... build: Move the compiler checks and libtool initialization 
  322ec01... config: Don't read a config file at startup when using --di
  dae2970... tests: Don't use g_test_verbose() as cogl doesn't use GTest
  dd2dbde... build: Indicate if cogl is build with i18n support
  5bb3004... build: Use the correct variable to indicate of cogl-gles2 w
  a55b9d8... Adds CoglError api
  a430667... build: Allow to build cogl without an external glib depende
  74340c5... Build: Add a --enable-standalone option
  5f99463... build the sdl examples when glib is disabled
  28a8d5b... build: Create the libtool file early as it's used by AS_GLI
  6a0f4bb... build: don't include deps/glib headers if glib enabled
  5e61782... texture: rename texobj flush code as gl specific
  549de90... texture-2d: factor out all GL specific code
  6ee00c2... blit: avoid using _COGL_GET_CONTEXT
  3461852... attribute: Split out GL specific code
  7df4251... Adds a NOP driver
  0e49155... clip-stack: Splits out opengl specific code
  e620c6e... buffer: move choice about using malloc closer to driver
  d750849... Give buffer/bitmap bind functions gl infix
  51a3d31... buffer: splits out GL specific code
  7c18adf... pipeline: remove dubious optimization
  50c05a4... pipeline: remove unused _MASK defines
  3568870... pipeline: remove duplicate defines
  76dae31... pipeline: tidy up definition of *END defines
  641ad03... Clearly define 3 progends that own the frag+vertends
  2224ebe... Fix a warning in the vtable for texture_2d_get_data
  27bb48b... driver-gl: split out parse_gl_version function
  1aa591e... check the glsl version during init
  d35ce05... add cogl-glsl-shader files to aid backporting patches
  ecb338e... Unify a lot of gles2 vs gl glsl code
  257b857... egl: remove special re-try without stencil code
  29a95b0... driver-gl: re-indent misleading if-else statement
  8e2ce48... pipeline: Don't notify the undefined progend of layer chang
  56d0944... Add a GL 3 driver
  b012061... Add a simple conformance test for alpha testing
  f30782c... progend-glsl: Fix handling of the builtin uniforms on non-G
  2336740... Fix a warning when building without GLES2 support
  7b2861f... object: Move cogl_object_{ref,unref}() to cogl-object.h
  a470c3a... framebuffer: Annotate the output parameter of get_viewport4
  acf23c3... display: Fix 'arguments' typo
  4f5ae9d... Fix a warning when building the SDL2 winsys
  7963fdb... sdl2: Fix GL3 context creation
  c83b26c... build: fix make dist
  53ca775... context: glib-mkenums chokes on /*< private >*/ but support
  b69ef09... error: Fix 'burden' typo
  b0388cf... context: Re-add /<* private *>/ for _COGL_N_FEATURE_IDS
  b7c7e7a... Add cogl_buffer_map_range()
  e2dc60f... Use cogl_buffer_map_range from the journal
  a236322... Add a test case for cogl_buffer_map_range
  350a7cf... Make cogl_color_init_from_4fv take a const array
  e2bb76f... Don't add the ARB suffix for the GL_ARB_map_buffer_range ex
  0b270a7... clip-stack: workaround intel gen6 viewport clip bug
  3a0e57f... cogl: Enable PBO path for all mesa versions when using inte
  36cfe48... tests: Convert test-npot-texture to Cogl
  456b331... Support window resizing in the SDL 2 winsys
  4fd7980... Fix flushing the stencil viewport clipping workaround
  28407e3... sdl: Support setting resizable before allocate in SDL 1
  e69c602... Use GL_ARB_texture_swizzle to emulate GL_ALPHA textures
  30fe9a5... Add cogl_sdl_onscreen_get_window()
  8625c36... configure: Don't allow --enable-gdk-pixbuf with --disable-g
  13a1433... Fixes for --disable-glib
  c00b404... Check for out-of-memory when allocating 2d textures
  dfec675... tests: update inline with master
  1a4e8de... tests: Don't report success when the test is skipped
  a260bd4... tests: Differentiate between known failures and missing req
  0a92d20... Add a conformance test using alpha textures
  8b9d3ff... Check for out-of-memory when allocating 3d textures
  7f5efb7... sync cogl-blit and cogl-texture with master
  743a810... Remove the varying array for tex_coords
  5960a24... Adds back tex_coord array for CoglShader compatibility
  efc48ed... progend-glsl: dirty prog for vertex state changes
  3d4f76b... attribute: Adds support for constant CoglAttributes
  c8d889f... attribute: Only unref buffer for buffered attributes
  2d92b11... Allow propogation of OOM errors to apps
  63e0c1e... atlas: catch _create_texture errors
  2adfe6d... texture: split out high-level texture constructors
  a03a59b... bitmap: ret CoglError from _new_with_malloc_buffer
  2ac912b... matrix-stack: init cache->flipped
  5803d5c... moves some gl texture code too cogl-texture-gl.c
  b677a13... blit: avoid referring to framebuffer stack
  59cf0db... Fix spelling of _cogl_propagate_error
  43a0189... error: Don't allocate a new CoglError when propagating
  c52197b... journal: don't reference global context
  df5e2d6... framebuffer: remove use of _COGL_GET_CONTEXT
  c286fa2... glx: avoid use of _COGL_GET_CONTEXT()
  9b49cdb... cogl-pango: Updates to no longer require a default context
  62a8549... atlas-texture: remove some use of _COGL_GET_CONTEXT
  71f3b0b... texture: expose mipmap level in set region apis
  dcbe127... tests: port test-texture-get-set-data to be standalone
  a5aa6bf... Simplify test-pixel-buffer
  f7d751c... Fix handling of binding errors when uploading a full textur
  fe5695f... x11: Replace all internal usage of cogl_xlib_get_display()
  2b32060... journal: don't call cogl_attribute_buffer_new with NULL
  2fcc2f2... matrix-stack: getting parent ptr before freeing
  a88f0d1... matrix-stack: move pointer to top of CoglMatrixEntry
  fe2aaef... matrix-stack: only maintain composite_gets in debug builds
  c6d6035... matrix-stack: make CoglMatrixStack public
  e0f5167... sdl: Bind the default window when currently bound window is
  693fe17... Don't use #if with defines that are either defined or not
  6c2c412... build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES fro
  bc6ed3b... build: Use -Wundef when possible
  8a20089... doc: Use Returns: to annotate return values
  6f2fb41... doc: Move the main loop integration in the integration sect
  ae05aa5... doc: Re-organise the first few sections
  4202dd4... doc: Add all the objects with a role leading to context cre
  3417a0f... doc: Add missing symbol in cogl_framebuffer_get_context() d
  dcaceb3... doc: Automatically build the list of *-private.h files
  f13b5a4... doc: Expose the Cogl GLES 2.0 facilities in the documentati
  6fee127... doc: Fix a typo in the description of cogl-bitmap
  bd50ec4... doc: Expose CoglBitmap
  e5ccf41... doc: Fix argument syntax of existing commment blocks
  5f82b83... doc: s/Fuction/Function/
  d5c4d95... doc: Remove the last reference to VertexArrays
  f95ef1b... doc: Update the section name and description of CoglIndices
  65fdd91... doc: Fix small typo of sequence
  8c89c09... doc: Declare CoglIndices
  e43b60f... doc: Finish describing the arguments of cogl_error_matches(
  1616997... doc: The filter related functions have lost '_native'
  5963a76... doc: Make a pass on CoglRenderer argument documentation
  e0b790a... doc: Fix various mismatches between arguments and their doc
  fa4573c... doc: Document the members of CoglPollFDEvent
  c9d0a64... doc: Fix copy/paste error for cogl_framebuffer_get_alpha_bi
  abe021b... doc: The swap functions have moved from the framebuffer to 
  80cfb8d... doc: Document CoglColor
  bd2147d... doc: Unhide cogl-matrix-stack.h
  eeb2626... doc: Use <ulink> to make Gimbal Lock reactive
  a93c542... doc: Rename the remaining CoglMaterial* elements in the sec
  504915e... doc: Expose CoglDepthState
  c934cf5... doc: Fix the remaining warning around the depth state
  5454a85... doc: Don't use the HTML <ul> but the DocBook equivalent
  a610446... doc: Populate cogl-types a bit more and move it to the gene
  34d06b1... doc: Don't use '::' to denote an object property
  eb1a748... doc: Add Onscreen to the party
  dfa0703... doc: Fixup type references
  5395dce... doc: Fix FALSE documentation
  a1760b6... doc: Put the opening '{' at the end of combined typedefs
  6614a74... doc: Add a missing '*' to the documentation of CoglFilterRe
  dbdef0a... doc: Update the list of files to ignore
  05192b4... doc: Use Docbook's <constant> for external constants
  874a9f6... doc: Fix cross-referencing with glib and gdk-pixbuf
  d65e406... doc: Fix the remaining broken internal cross-references
  0a486ae... enum-types: Fix the header guard #endif comment
  7875553... build: Hide cogl_pipeline_cache_{new,free}()
  8c65345... doc: Add 2013 in the Copyright statement
  bf69cfa... stash: quark/domain
  092a5f4... Remove cogl-internal.h
  1e541c5... framebuffer: split out GL read_pixels code
  d13ff0d... Move _cogl_texture_get_gl_format to -texture-gl.c
  4491793... texture: add width/height members to base CoglTexture
  d2309a8... Allow lazy texture storage allocation
  7a3966a... texture: Adds cogl_texture_set_data convenience api
  f7c5477... texture-2d-slice: Fix the foreach_sub_texture_in_region imp
  0fb3405... Also flip the virtual coordinates when iterating spans
  03c25c9... Add a conformance test for some wrap modes on a rectangle t
  809f7f1... Query glX* functions before getting the context to fix GL3 
  2d66760... Add a test for getting the component sizes from different f
  460242c... framebuffer: Bind the framebuffer before querying the bits
  e5c7c8b... Add a public cogl_framebuffer_get_depth_bits() function
  1513be8... Query the framebuffer stencil bits instead of assuming it's
  a08d10e... framebuffer: Support the GL_RED texture workaround when que
  7989d91... Don't try to use clip planes on GL3
  abb5388... Fix filling the array of texture pointers for sliced textur
  baf83cc... Reorder some struct members to avoid padding due to alignme
  5a0a9ba... disable viewport scissor workaround for clear
  a7934a5... tests: flag backface culling failure without NPOT support



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]