← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/gallium/auxiliary/draw/draw_gs.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-08-23 15:37:30 UTC
  • mfrom: (1.7.6)
  • Revision ID: package-import@ubuntu.com-20120823153730-c499sefj7btu4386
Tags: 9.0~git20120821.c1114c61-0ubuntu1
https://launchpad.net/bugs/1009089
* Merge from unreleased debian git.
  - Includes support for ATI Trinity PCI IDs (LP: #1009089)
* rules, control, libgl1-mesa-swx11*: Remove swx11 support.
* Refresh patches:
  - drop 115_llvm_dynamic_linking.diff,
    117_nullptr_check_in_query_version.patch, and
    118_glsl_initialize_samplers.patch, all upstream
  - disable 116_use_shared_galliumcore.diff until it's reviewed and
    reworked to apply
* not-installed, libegl1-mesa-drivers-install.linux.in: Updated to
  match the single-pass build.
* libgl1-mesa-dri.*install.in: Drop libglsl.so, it's included in
  libdricore.so now.
* rules: Don't disable GLU on the common flags, we need to build it
  on the dri target.
* libglu*install.in: Fix the source file paths to match the build target.
  Drop the static lib from -dev since only shared libs get built.
* libgl1-mesa-dev.install.in: Fix the source file paths to match the
  build target.
* libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so,
  which isn't built yet.
* rules: Enable llvmpipe on armhf to see if it works or not.
* rules: Remove bin/install-sh on clean, and don't create a symlink for
  it.
* control: Add Pre-Depends on dpkg-dev due to the binaries using xz
  compression.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/auxiliary/draw/draw_gs.c
45
45
boolean
46
46
draw_gs_init( struct draw_context *draw )
47
47
{
48
 
   draw->gs.machine = tgsi_exec_machine_create();
49
 
   if (!draw->gs.machine)
 
48
   draw->gs.tgsi.machine = tgsi_exec_machine_create();
 
49
   if (!draw->gs.tgsi.machine)
50
50
      return FALSE;
51
51
 
52
 
   draw->gs.machine->Primitives = align_malloc(
 
52
   draw->gs.tgsi.machine->Primitives = align_malloc(
53
53
      MAX_PRIMITIVES * sizeof(struct tgsi_exec_vector), 16);
54
 
   if (!draw->gs.machine->Primitives)
 
54
   if (!draw->gs.tgsi.machine->Primitives)
55
55
      return FALSE;
56
 
   memset(draw->gs.machine->Primitives, 0,
 
56
   memset(draw->gs.tgsi.machine->Primitives, 0,
57
57
          MAX_PRIMITIVES * sizeof(struct tgsi_exec_vector));
58
58
 
59
59
   return TRUE;
61
61
 
62
62
void draw_gs_destroy( struct draw_context *draw )
63
63
{
64
 
   if (!draw->gs.machine)
 
64
   if (!draw->gs.tgsi.machine)
65
65
      return;
66
66
 
67
 
   align_free(draw->gs.machine->Primitives);
 
67
   align_free(draw->gs.tgsi.machine->Primitives);
68
68
 
69
 
   tgsi_exec_machine_destroy(draw->gs.machine);
 
69
   tgsi_exec_machine_destroy(draw->gs.tgsi.machine);
70
70
}
71
71
 
72
72
void
121
121
         gs->max_output_vertices = gs->info.properties[i].data[0];
122
122
   }
123
123
 
124
 
   gs->machine = draw->gs.machine;
 
124
   gs->machine = draw->gs.tgsi.machine;
125
125
 
126
126
   if (gs)
127
127
   {
483
483
   if (shader && shader->machine->Tokens != shader->state.tokens) {
484
484
      tgsi_exec_machine_bind_shader(shader->machine,
485
485
                                    shader->state.tokens,
486
 
                                    draw->gs.num_samplers,
487
 
                                    draw->gs.samplers);
 
486
                                    draw->gs.tgsi.num_samplers,
 
487
                                    draw->gs.tgsi.samplers);
488
488
   }
489
489
}