← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/drivers/svga/svga_pipe_fs.c

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/svga/svga_pipe_fs.c
28
28
#include "util/u_memory.h"
29
29
#include "util/u_bitmask.h"
30
30
#include "tgsi/tgsi_parse.h"
 
31
#include "draw/draw_context.h"
31
32
 
32
 
#include "svga_screen.h"
33
33
#include "svga_context.h"
34
34
#include "svga_tgsi.h"
35
35
#include "svga_hw_reg.h"
46
46
                     const struct pipe_shader_state *templ)
47
47
{
48
48
   struct svga_context *svga = svga_context(pipe);
49
 
   struct svga_screen *svgascreen = svga_screen(pipe->screen);
50
49
   struct svga_fragment_shader *fs;
51
50
 
52
51
   fs = CALLOC_STRUCT(svga_fragment_shader);
60
59
   tgsi_scan_shader(fs->base.tokens, &fs->base.info);
61
60
 
62
61
   fs->base.id = svga->debug.shader_id++;
63
 
   fs->base.use_sm30 = svgascreen->use_ps30;
64
62
   
 
63
   fs->generic_inputs = svga_get_generic_inputs_mask(&fs->base.info);
 
64
 
 
65
   svga_remap_generics(fs->generic_inputs, fs->generic_remap_table);
 
66
 
 
67
   fs->draw_shader = draw_create_fragment_shader(svga->swtnl.draw, templ);
 
68
 
65
69
   if (SVGA_DEBUG & DEBUG_TGSI || 0) {
66
70
      debug_printf("%s id: %u, inputs: %u, outputs: %u\n",
67
71
                   __FUNCTION__, fs->base.id,
91
95
 
92
96
   svga_hwtnl_flush_retry( svga );
93
97
 
 
98
   draw_delete_fragment_shader(svga->swtnl.draw, fs->draw_shader);
 
99
 
94
100
   for (result = fs->base.results; result; result = tmp ) {
95
101
      tmp = result->next;
96
102