[gtk] Non-fast-forward update to branch wip/chergert/glproto



The branch 'wip/chergert/glproto' 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:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  507b0c4... stub out prototype bits for different GL renderer design
  b5a6545... add clear helper
  d622a4d... setup texture library frame ends
  5851464... setup modelview stack
  d1eed99... start bringing over some of the modelview bits
  f443986... cleanup offset handling
  247bd30... transform can be null
  e948ab5... add renderer to test utils
  078fb94... break job into a prepare and render phase
  6051c92... add execute func
  da04d03... setup command queue before libraries
  6342a19... add viewport hook
  5abb98a... stub out job render a bit
  0821def... check clip before visiting node
  8e2b204... always keep a node in the all_queue
  4b343b6... start on more memory friendly version of command queue
  b8dd9f1... reset arrays on end frame
  ea30ecc... ensure clear call is done inside of frame begin/end
  d18718f... sketch out some real basics for drawing
  0a6b115... apply framebuffer from clear command
  94542ec... use shorts for WxH of viewport within batch
  398fb2b... use union to make batch size smaller
  0b9a480... handle initial state for uniform info
  f1db70c... only setup viewport uniform if location is > -1
  2cb35cb... mark queue as in draw
  5834f3a... viewport is changed now
  44a4f20... give more information about uniform failure
  e4567a0... always allocate some space
  8d4d7d9... wrap matrix setter
  7873e97... add some precondition checks
  0c0f492... cache commonly used location at known offset
  858e0e0... setup matrix uniform for modelview
  892ed15... fix batch tail ordering
  132fa77... check max texture size when starting a frame
  9d36772... only set viewport once
  b2d0a0d... DRY viewport change
  c63b604... change program for draw batches
  009a07d... cleanup style, more asserts
  cc35f79... set initial state to FALSE
  25ca656... more assertions
  57f6ea6... fix alignment of uniform sizes
  6e93a4e... remove extra bind sets
  ca53d9a... style cleanup
  60612c5... start with scissor disabled
  41d4115... use bitfields instead of flags
  f46a5d1... mark some costly things as unlikely
  c14903a... better naming
  c3daf0e... detach shader before deleting
  fc12fed... use array instead of hashtable
  14e765f... only change framebuffer if non-zero
  1a5f7b5... some cleanup
  1cd4956... fix shader suffix
  9aaadce... add some debug helpers
  83a92d5... use aUv not vUv
  5fda43a... be safer about clearing things even if we error
  4545b58... setup clip for color node
  93b5da2... setup clip rect as part of starting draw
  af5997f... make program uniform setting passthrough
  22a77e8... implement linear gradient node
  98303fe... cleanup
  644e3cb... remove helpers
  9cc3979... extract out of jump table
  53a07c2... stub out fallback
  51c158b... bring over transform check
  ef38838... stub out simple transform nodes
  5b7d437... start on clipping
  eee0a44... fix program
  b12b013... start on basic rounded clip
  28ea9a9... clear uniform state to zero when expanding
  a8f8c90... start on border node
  320d48e... add renderer to node-editor
  796a1f5... ensure we've loaded max texture size
  62bfc63... make current before deleting program
  3d49d3f... handle clip more gracefully
  ad894a0... error harder
  470b08c... cleanup assertions
  e2b292c... set uniform initial state bit when resizing
  29fe282... copy clip to avoid invalidation by visiting other nodes
  7a55027... only do one memset
  b8d7472... remove debug code
  51c50e2... more assertions
  359fa9b... increase alignment for dynamic uniform state
  b0097be... add 4fv wrapper
  501165e... borders program
  c3e2333... reduce overhead for setting uniforms
  d5b224b... implement unblurred inset shadow
  5623ec1... fix typo in program indexes
  743d317... add gsk_gl_render_job_draw() with float variant
  dc8a5ef... implement unblurred outset shadow
  cf4fe57... discard batches with no draws
  cd68605... cleanup style
  844cf38... implement conic gradient
  0ab27f5... add alpha location
  c7b95a6... stub out offscreen draw
  0c6408c... implement cross fade node
  bbfe6b0... avoid some locals
  a2bf43e... add offscreen draw helper
  a68a18c... render opacity nodes
  4093d86... move autorelease semantics to driver
  b84e37f... update copyright
  4228b47... stub out some texture api in driver
  8c8b09c... implement texture collection w/o double iteration
  89043d3... start on texture loading
  790033f... implement uploading from command queue
  fa00a2c... update copyright
  f768628... stub out more nodes
  7297120... stub out other nodes
  e0e1985... more stubs
  3e12ca2... add texture pool
  e9ba93b... fix typo
  806014a... cleanup texturing code in driver
  4a45cdc... fix some warnings
  ba7a6a7... add documentation
  d75f58e... stub out some more texture interactions
  c296679... ideate around offscreen
  96d5f41... simplify with some macros
  ca15717... fill area on loading
  fd8bbc2... stub out library upload/lookup hooks
  175bbaf... fix scale
  9d7ffd2... cleanup style
  01ba2bb... helper to dump framebuffer after each batch
  71a82d6... make inline to avoid warning
  b0bb2da... fix viewport size changes
  46fccf3... clear in_draw when discarding batch
  4f7caf7... style cleanup
  fc7d965... add flipped rendering
  642ad1c... include offset for linear gradient
  26783c3... match fv variants to uniform kinds
  650307f... make sure we don't leave this out
  4f48946... transform rounded rect for uniform border
  8174030... use rounded rect
  d1d956a... stub out fallback drawing
  8fd3cdf... offscreen cleanup
  eb48ef2... more texture upload, vertices work
  66681c5... fix warning
  7847b86... fix typo
  b0eeef0... more offscreen rendering work
  7620595... improve clipped child drawing w/ offscreen
  662e0dc... add missing bounds
  5bf4885... move lower near other public funcs
  2618da2... more offscreen drawing work
  00a12ed... fix typo
  26f3566... fix flip based on offscreen
  0b8e1d8... repeat node
  29117aa... color matrix node
  5eaec16... implement radial gradient
  0cf82de... set cairo/repeating gradients as fallback
  63264ab... implement blend node
  64a1def... implement basics of blur node/texture
  d4a9cd5... some blur tweaks
  457bc05... make header as private
  07aa262... add render target abstraction
  9e588e6... make autorelease framebuffer private
  c0e4519... use single frame caching for now
  289c40e... style cleanup
  58b9fc0... blurred inset shadows
  1666aa1... improve cleanup state of framebuffers
  f3e1d95... add design doc
  353e8cb... Add next to GSK_RENDERER=help output
  1894d82... xxx: Fix a typo
  94a0788... Hook up fallback debugging
  e9c9237... add shader loading (and unloading) to driver
  755acc5... implement more complex category for transforms
  63b7d4f... add some missing uniform setters/types
  dd36bba... pass error along
  9e5d364... allow -1 for a failure program
  461a9cf... start on shader nodes
  6fb6f45... wire up attributes and shared uniforms
  74686da... move fallback out of shader node
  5578b8b... implement shadow node
  185c876... stub out blurred outset shadow
  91060e9... fix assertion
  7847fa0... initial work on glyph cache
  041f995... start on texture atlasing plumbing from driver to libraries
  0ffa923... fix positioning of glyphs
  692b06f... flesh out glyph uploads a bit
  da21ad8... skip if no texture to render
  d6e0336... add helper to dump atlas contents
  3042809... implement basics for icon library
  a29f74e... set max size for icon library
  fd26bde... add helper to check cachability
  b9b9233... fix width/height calculation within atlas
  2816ffd... start on texture node
  83e80a1... fix rouneded rect transform
  4beaffb... simple batch merging
  70b8508... ignore texture changes to 0
  5ab1188... return false when texture id is 0
  54af4ed... add check for valid entry size
  dfce807... add texture and vertices for color matrix
  33ec7f6... remove unused code
  db635df... fix pack position in icon cache
  b30f375... use glyph cache for small textures
  4d8c8de... debug atlas content after uploads but before commands
  d2f57c8... add debug printf for uniform locations
  aa0b645... always do inital set of texture slot
  0d7fd2f... fix offscreen bounds
  f826aee... add some assertions
  bfe5009... use macro helper
  e582dfb... apply scissor clip while processing fbo changes
  5cd44ae... cleanup has-clip check
  53066b5... fix early return for rounded clip node
  e2e3647... cleanup texture state when freeing
  2d9eccb... document renderjob internals a bit
  63ba344... start on sharing driver instance across renderers
  9c86014... ensure context before atlas uploads
  f89a3b4... get max_texture_size immediately on creation
  e1a2eba... allow for multiple command queues with shared state
  59eb997... some todo items
  01fa7b9... dont share attachments
  f7da420... reset texture attachments when ending frame
  98ab90f... avoid save/restore of attachment state
  f3e13fc... use floats for comparison
  445a29e... fix alpha when only drawing cross-fade end node
  633c706... actually draw the cross fade
  c3ff451... fix uniform format
  0d072ea... add assertions
  7dadbd4... use previous frame to determine new buffer size
  f921784... check for valid uniform format
  37a7d6a... unlikely but check anyway
  6d601bd... fix texture location for blend op
  307f8da... avoid extra copy of rounded rect
  ab13dc9... ensure our send_corner state is correct
  9c06afd... only clear corner state
  a784da7... more assertions
  cccc74b... check corner state before replacing uniform pointer
  06cbbd7... begin draw before changing uniforms
  3305193... fix whitespace
  30b0020... more assertions
  7863978... keep program const
  78c78cd... reset uniform flags
  8cbdbda... use initial field to force sending corners
  88b7b5c... check initial flag and count in setters
  0bb5318... check more initial state in comparisons
  2bd7a49... track if we're in a frame
  8e79ece... move texture cleanup to pooling code
  08499b1... collect textures from previous frame
  7fc5243... fix warning and more assertions
  cc9ace2... add some debug code
  3cdd84f... make sure we track gl texture lifecycle
  5d74bf0... free textures back into the texture pool
  38e186e... testsuite: Add next renderer to gsk tests
  e365114... port to new gradient code
  a435e9a... use inlined rect_contains_rect
  b1ed5aa... use inlined memcmp for rounded rect comparison
  3cba82d... use offscreen to flip-y, similar to gl renderer
  cc49630... port over texture slicing
  ea5c7da... add missing bit about main()
  3f07948... implement texture slicing in texture node
  65f0cf5... update todo
  d9379ba... only reset changed textures
  c553f4a... add shadow library
  d59e2a2... fix texture lifecycle management
  b49b8b0... implement non-sliced shadows
  e58d285... add nine slicing helpers
  81ffb79... cleanup simple case drawing
  17508ab... add helper to lookup texture by id
  dba198c... namespace a bit
  4797986... port blurred outset shadows to renderjob
  e490281... add missing custom.glsl source
  f76e6f3... update todo
  89befd2... give hook for glshader to compile on next renderer
  9412c9e... make closer to glutilsprivate.h implementation
  d796663... igmore zero case
  5c5ed13... handle degenerate assertions in nine slices
  f79e58f... this shouldn't bee needed now that we track textures
  6e77ee9... give more info in filename when debugging
  abb8532... add missing wrapper should we end up using it
  89eb5af... fix unblurred outline rendering
  0aa789a... fix unblurred inset shadow
  67d1149... blurred inset shadow needs transformed rect
  3575237... use offscreen directly instead of rect
  661cb2f... use x/x2 instead of x/width
  c844a0e... handle unlinked uniforms more gracefully
  3cc04a3... switch to x,x2 areas for texture libraries
  cfbfe16... update todo
  59a7d70... handle changes to array length
  47df707... always set initial bit
  946de59... more assertions
  36cf3df... flip y when drawing framebuffers from command queue
  65cbe59... fix missing texture source for blit
  da41790... disable sanity debugs for now
  c7d6bb4... use 4f instead of 4fv
  268ed15... fix clipped child bounds
  4f8e590... make sure we have a non-zero render target
  10c70b6... reset alpha for offscreen drawing
  fb99489... cleanup handling of opacity nodes
  b859923... try a bit harder to keep command queue current
  c9322b3... use half_blur_extra
  45811cd... more details in file name
  6152eb6... set framebuffer on attachment state directly
  e8a0a3d... use assertions in some cases
  34b8f9f... add split draw API
  6821b3e... use split_draw() when processing glyphs
  2e18b7f... hoist begin_draw out of some loops
  ea5f49c... make original comment more clear
  ebc9058... remove superfluous constage
  66e61f0... only need a bit
  4bf2eb5... use gboolean instead of bool
  c18dfd2... style fixes
  7f9a416... add helper to print batch information to console
  d20db53... avoid float conversion for x,y coords
  07c0a80... check current clip, not new clip
  1c12c88... actually use the blit program
  3660173... add helper to create GdkGLTexture
  1668c93... use driver for gdk texture creation
  b3eac28... add issing 1ui handler possibly used by GskGLShader args
  19e6027... add helper to get format size
  c15ec75... decode uniform data when dumping batch info
  6fde691... use g_printerr consistently
  8787c84... fix missing comma
  0f5dec9... specify clear bits in debug output
  780782a... style fixup
  19b24d1... add number of vertices in draw
  c8a6687... always setup initial framebuffer
  92ea91a... update todo
  abb7989... fix cleanup of custom shader programs
  529a224... add various renderer timers and counters
  bb17d30... add build/execute command queue marks
  920844a... add marks for texture uploads
  76d8244... use gdk profiler for fbo/uniform/attachment counters
  b60518c... update todo
  52de06b... fix symbol names
  c419155... defer frame cleanup until after we swap buffers
  7078322... inline buffer advance and offset
  78f6cef... drop memcpy for old value
  615a9a4... manage uniform buffers without gbytearray
  7ec34f2... remove swap buffers
  518911a... do less work
  ba7ce67... ignore debug groups unless G_ENABLE_DEBUG
  e7d888e... state is const here
  ec7fa6f... hoist has_scissor
  f8bcc8f... avoid second copy
  3d7496c... allow inline snapshot callback
  a9a66ac... give jumptable a chance to optimize out
  5f406d6... dont memset batch on resize
  25f3ad2... style consistency
  fd0c7c1... pass fewer pointers
  da5acf7... precalculate scissor rect
  f2b85a6... keep shared state counter in driver
  68710f9... this is always non-null
  65e7643... call glActiveTexture less when executing
  722709b... cache clip and modelview pointers
  b617d06... inline draw helper
  cfd0e96... include epoxy i a single place
  96c3193... track number of texture uploads as metric
  cde70cd... avoid glDisable/glEnable() scissor test state changes
  e83f235... inline isnan check
  b677b4c... avoid walking gaps in location mapping array
  eb1a514... use floorf
  80f84a4... call make current a bit less
  3e3b308... use const for visitors and inline
  d3d027f... store render nodes as const locals
  33fd3bb... tweak order we check things
  4cbaf7f... use memcmp
  ad6d299... compile out assertions in some hotter paths
  0b39d42... inline some cache lookups
  07cc6c8... perform cleanup before frame instead of after
  0ca7477... texture size should be int
  8cc4676... remove state save
  fb4371f... remove attachment save/restore
  550c48b... specifically set clear color
  6595809... keep compare same as draw
  785ca12... mark count as unused as its for debugging
  c2ba996... prefer pointer math
  e97dbbd... use memcmp for corners
  4f078c8... avoid some repeated g_array_set_size() calls
  532063a... simplify a bit more
  dbae4d7... try to iterate fewer attachment slots
  58c270a... check our batch before the previous
  e661d23... use fast int type
  13df9e4... use fv and iv variants when setting uniforms
  2f0ec19... use pointer variant for all uniform values
  cfcb29c... avoid converting to float[]
  7d7505b... inline uniform application
  eb2ff32... wait to get render region until after starting frame
  19689c2... cleanup a bit
  77fe0ff... make state value false when disabling scissor
  d46bba5... fix state checks
  fed36fe... inline rgba is clear check
  0d7cc92... share alpha check
  0e67ab2... use cached transform bounds
  421bfe5... remove getters for things accessible from job pointer
  16bcb60... inline projection init
  bc19613... remove singly used functions
  277264a... use single glDeleteTextures() call when freeing pool
  c61644f... do post-buffer swap cleanup
  4b0175f... remove append_val from hot path
  3dde660... use memcmp for rgba compare
  c3057c4... remove check from very hot path
  3d4dd8f... use gsize for positions/len
  439d6ed... always bind fb 0
  d51fa47... give compile time access to location offset storage
  0e144c9... dont set this until we need it
  de8fde0... remove branch from hot path
  bbcbb3f... remove a pointer chase
  753bbe9... use memcpy for corners
  bb7ff33... inline most common transform, 2d-affine
  6fe6398... remove indirect pointer to uniform info
  531c784... make get_uniform() inline and remove fallbacks
  12e7177... remove framebuffer reuse
  80124ad... use memcmp for compare
  6f22acc... presize arrays
  595472e... remove unnecessary memcpy
  2b55bc1... copy proposed fix for GL
  4500263... reduce allocations and lookups in uniform state
  eb78e4b... give uniform usage a chance to be inlined
  4a66204... dont inline toplevel visitor
  f558851... use memcmp for colors
  b0adb22... read initial bit before unifrom data
  acf206d... remove unnecessary rectilinear call
  ed47794... remove use of garray in batches
  a0cd111... use move-to-front semantics for glyph cache
  cf05a8c... add helper to grow/retract vertices
  eb11c14... add text glyph vertices in one batch
  d9e63a1... style cleanup
  70d00c2... Revert "add text glyph vertices in one batch"
  01bde97... add text glyph vertices in one batch
  625e7b3... bring batch glyph vertices batching
  aeb1876... return previous fbo when binding
  3712f44... remove state save/restore semantics
  9e83013... bring begin/end draw into render job
  da347d8... restore prev alpha
  60f3224... add stamp when we change uniform value
  b24ea7f... add plumbing for per-uniform stamps
  4a720ed... use stamps to avoid costly comparisons
  86da24c... actually use stamp to compare
  edfa8fb... remove stamp change
  4758f50... implement basic framebuffer sorting
  b7fb28b... more assertions
  d22ff69... dont reorder if we end up at the same place
  348c914... add definable inline array
  6af75aa... we only need 4 textures
  3840fb8... implement basic batch reordering by framebuffer
  3702f44... remove debug groups
  c41f34c... we only need 4 textures
  95832fc... branch unnecessary
  3ea4975... avoid some re-calculations of corners
  716063c... fix cache reclamation
  a2bfc7c... bring over GL glyph subpixel fix
  3b84952... bring over various bugfixes from GL renderer
  92f1bf3... bring fix over for y-flip
  2862d4a... always stash new values for uniform state
  2f1ad5b... remove simple batch merging
  ec93cf1... remove dead code
  8da0625... remove matrix hack
  3e8935d... Revert "remove dead code"
  36e4c8b... Revert "remove simple batch merging"
  dbe10e9... add very simple snapshot comparison code
  6b458a1... batch draws if snapshots are comparable
  43a3044... make bitfield go a bit further
  1004d75... steal another bit from array count
  478c4f6... Add an assertion
  f77352b... we bumped to 21
  3313936... ignore unused uniforms in gl shader
  7744dac... add back check for invalid location
  e097150... make it clear the size requirements for array_count
  e09e7b8... DRY the bits available in packed struct
  f3edb9f... fix typo
  cf943de... shorten data field name
  a3eec1b... allow defining more of inlinearray bits
  851a7ca... shorten array names
  21fc425... remove dead code
  7592df5... delay scissor setup
  21a54f0... improve damage rect calculation
  6e7bd05... style cleanup
  4c0febb... more assertions
  5d783d5... special case growing array sizes
  644f3dd... cleanup our offset/4 hack
  adcd24d... here too
  becca36... short-circuit when offsets match

Commits added to the branch:

  893a77e... gsk: add OpenGL based GskNextRenderer


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