← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/gallium/drivers/softpipe/sp_state_vertex.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/softpipe/sp_state_vertex.c
32
32
#include "sp_context.h"
33
33
#include "sp_state.h"
34
34
 
 
35
#include "util/u_memory.h"
35
36
#include "draw/draw_context.h"
36
37
 
37
38
 
 
39
void *
 
40
softpipe_create_vertex_elements_state(struct pipe_context *pipe,
 
41
                                      unsigned count,
 
42
                                      const struct pipe_vertex_element *attribs)
 
43
{
 
44
   struct sp_velems_state *velems;
 
45
   assert(count <= PIPE_MAX_ATTRIBS);
 
46
   velems = (struct sp_velems_state *) MALLOC(sizeof(struct sp_velems_state));
 
47
   if (velems) {
 
48
      velems->count = count;
 
49
      memcpy(velems->velem, attribs, sizeof(*attribs) * count);
 
50
   }
 
51
   return velems;
 
52
}
 
53
 
38
54
void
39
 
softpipe_set_vertex_elements(struct pipe_context *pipe,
40
 
                             unsigned count,
41
 
                             const struct pipe_vertex_element *attribs)
 
55
softpipe_bind_vertex_elements_state(struct pipe_context *pipe,
 
56
                                    void *velems)
42
57
{
43
58
   struct softpipe_context *softpipe = softpipe_context(pipe);
44
 
 
45
 
   assert(count <= PIPE_MAX_ATTRIBS);
46
 
 
47
 
   memcpy(softpipe->vertex_element, attribs,
48
 
          count * sizeof(struct pipe_vertex_element));
49
 
   softpipe->num_vertex_elements = count;
 
59
   struct sp_velems_state *sp_velems = (struct sp_velems_state *) velems;
 
60
 
 
61
   softpipe->velems = sp_velems;
50
62
 
51
63
   softpipe->dirty |= SP_NEW_VERTEX;
52
64
 
53
 
   draw_set_vertex_elements(softpipe->draw, count, attribs);
 
65
   if (sp_velems)
 
66
      draw_set_vertex_elements(softpipe->draw, sp_velems->count, sp_velems->velem);
54
67
}
55
68
 
 
69
void
 
70
softpipe_delete_vertex_elements_state(struct pipe_context *pipe, void *velems)
 
71
{
 
72
   FREE( velems );
 
73
}
56
74
 
57
75
void
58
76
softpipe_set_vertex_buffers(struct pipe_context *pipe,
70
88
 
71
89
   draw_set_vertex_buffers(softpipe->draw, count, buffers);
72
90
}
 
91
 
 
92
void
 
93
softpipe_set_index_buffer(struct pipe_context *pipe,
 
94
                          const struct pipe_index_buffer *ib)
 
95
{
 
96
   struct softpipe_context *softpipe = softpipe_context(pipe);
 
97
 
 
98
   if (ib)
 
99
      memcpy(&softpipe->index_buffer, ib, sizeof(softpipe->index_buffer));
 
100
   else
 
101
      memset(&softpipe->index_buffer, 0, sizeof(softpipe->index_buffer));
 
102
 
 
103
   draw_set_index_buffer(softpipe->draw, ib);
 
104
}