1. 23 Apr, 2014 3 commits
  2. 22 Apr, 2014 1 commit
    • Eric Anholt's avatar
      glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites. · e9240342
      Eric Anholt authored
      There is some complicated code to support tweaking the format as we
      upload from a SHM pixmap (aka the GTK icon cache), but if we weren't
      sourcing from a SHM pixmap we just forgot to check that the formats
      matched at all.
      
      We could potentially be a little more discerning here (xRGB source and
      ARGB mask would be fine, for example), but this will all change with
      texture views anyway, so just get the rendering working for 1.16
      release.
      
      Fixes the new rendercheck gtk_argb_xbgr test.
      
      v2: Squash in keithp's fix for checking that we have a non-NULL
          pixmap, and reword the comment even more.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
      e9240342
  3. 26 Mar, 2014 2 commits
  4. 17 Mar, 2014 5 commits
  5. 10 Mar, 2014 6 commits
    • Eric Anholt's avatar
      glamor: Fix requested composite VBO size. · 9b86f7a1
      Eric Anholt authored
      The argument to setup_composte_vbo is the number of verts.
      
      v2: Drop the now-unused vert_stride value.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      9b86f7a1
    • Eric Anholt's avatar
      glamor: Extract the streamed vertex data code used by Render. · d310d566
      Eric Anholt authored
      We should be uploading any vertex data using this kind of upload
      style, since it saves a bunch of extra copies of our vertex data.
      
      v2:
        - Add a simple comment about what the function does.
        - Use get_vbo_space()'s return in trapezoids, instead of dereffing
          glamor_priv->vb (by Markus Wick).
        - Fix the double-unmapping by moving put_vbo_space() outside of
          flush_composite_rects().
        - Remove the rest of the composite_vbo_offset usage, and just always
          use get_vbo_space()'s return value.
      v3:
        - Fix failure to put_vbo_space in traps when no prims were
          generated.
        - Unbind the VBO from put_vbo_space().  Keeps callers from
          forgetting to do so.
      v4:
        - Split out some changes into the previous 3 commits while trying to
          track down a regression.
        - Fix regression due to rebase fail where glamor_priv->vbo_offset
          wasn't incremented.
      v5:
        - Fix GLES2 VBO sizing.
        - Add a comment about resize behavior.
        - Move glamor_vbo.c init code to glamor_vbo.c from
          glamor_render.c. (Derived from Markus's changes, but the GLES2 fix
          dropped almost all of the code in the functions).
      v6:
        - Drop the initial BufferData on GLES2 (it happens at put() time).
        - Don't forget to set vbo_offset to the size on GLES2.
        - Use char * instead of void * in the cast to return the vbo_offset.
        - Resize the default FBO to 512kb, to be similar to previous
          behavior.  +1.66124% +/- 0.284223% (n=679) on aa10text.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      d310d566
    • Eric Anholt's avatar
      glamor: Track the next vertex offset as we go in render accel. · 03a33048
      Eric Anholt authored
      I want to extract the VBO mapping code, and as part of that I need to
      get the global vbo_offset munging to stop.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      03a33048
    • Eric Anholt's avatar
      glamor: Move glamor_emit_composite_vert() to traps, where it's used. · 438d8ace
      Eric Anholt authored
      It's only used in the nonantialiased, triangle-based trapezoids path.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      438d8ace
    • Eric Anholt's avatar
      glamor: Don't forget to set GL_INVALIDATE_RANGE_BIT on GL_ARB_mbr. · bce5ec4f
      Eric Anholt authored
      We don't need any current contents of the buffer, and this allows an
      implementation to make a temporary BO for a streamed upload if it
      wants to.
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      bce5ec4f
    • Eric Anholt's avatar
      glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE. · ca507d21
      Eric Anholt authored
      Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
      Reviewed-by: Markus Wick <markus at selfnet.de>
      ca507d21
  6. 15 Feb, 2014 4 commits
  7. 27 Jan, 2014 4 commits
  8. 18 Dec, 2013 15 commits