X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_pipe_fs.c;h=9aac546581eb7745242995943fc2125554a96304;hb=36ea744f58e5b436c45ed857bd92bbb472e641d5;hp=b71bc66552fa46e1b9a7ebe592fb351b954b217c;hpb=d1487dcb20b840658f8a9f71523b9eef76a13f6d;p=mesa.git

diff --git a/src/gallium/drivers/svga/svga_pipe_fs.c b/src/gallium/drivers/svga/svga_pipe_fs.c
index b71bc66552f..9aac546581e 100644
--- a/src/gallium/drivers/svga/svga_pipe_fs.c
+++ b/src/gallium/drivers/svga/svga_pipe_fs.c
@@ -28,8 +28,8 @@
 #include "util/u_memory.h"
 #include "util/u_bitmask.h"
 #include "tgsi/tgsi_parse.h"
+#include "draw/draw_context.h"
 
-#include "svga_screen.h"
 #include "svga_context.h"
 #include "svga_tgsi.h"
 #include "svga_hw_reg.h"
@@ -46,7 +46,6 @@ svga_create_fs_state(struct pipe_context *pipe,
                      const struct pipe_shader_state *templ)
 {
    struct svga_context *svga = svga_context(pipe);
-   struct svga_screen *svgascreen = svga_screen(pipe->screen);
    struct svga_fragment_shader *fs;
 
    fs = CALLOC_STRUCT(svga_fragment_shader);
@@ -60,8 +59,13 @@ svga_create_fs_state(struct pipe_context *pipe,
    tgsi_scan_shader(fs->base.tokens, &fs->base.info);
 
    fs->base.id = svga->debug.shader_id++;
-   fs->base.use_sm30 = svgascreen->use_ps30;
    
+   fs->generic_inputs = svga_get_generic_inputs_mask(&fs->base.info);
+
+   svga_remap_generics(fs->generic_inputs, fs->generic_remap_table);
+
+   fs->draw_shader = draw_create_fragment_shader(svga->swtnl.draw, templ);
+
    if (SVGA_DEBUG & DEBUG_TGSI || 0) {
       debug_printf("%s id: %u, inputs: %u, outputs: %u\n",
                    __FUNCTION__, fs->base.id,
@@ -91,6 +95,8 @@ void svga_delete_fs_state(struct pipe_context *pipe, void *shader)
 
    svga_hwtnl_flush_retry( svga );
 
+   draw_delete_fragment_shader(svga->swtnl.draw, fs->draw_shader);
+
    for (result = fs->base.results; result; result = tmp ) {
       tmp = result->next;