projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8' into master
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_video_context.c
diff --git
a/src/gallium/drivers/softpipe/sp_video_context.c
b/src/gallium/drivers/softpipe/sp_video_context.c
index 7a3a6361670391a6b35a145a4db3fc5c337bf64f..242aaac4665dbec87c245b1c417b77480abbd56a 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_video_context.c
+++ b/
src/gallium/drivers/softpipe/sp_video_context.c
@@
-25,10
+25,12
@@
*
**************************************************************************/
*
**************************************************************************/
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+
#include "sp_video_context.h"
#include "sp_video_context.h"
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
-#include "softpipe/sp_texture.h"
+#include "sp_texture.h"
+
static void
sp_mpeg12_destroy(struct pipe_video_context *vpipe)
static void
sp_mpeg12_destroy(struct pipe_video_context *vpipe)
@@
-174,7
+176,6
@@
init_pipe_state(struct sp_mpeg12_context *ctx)
rast.line_stipple_factor = 0;
rast.line_stipple_pattern = 0;
rast.line_last_pixel = 0;
rast.line_stipple_factor = 0;
rast.line_stipple_pattern = 0;
rast.line_last_pixel = 0;
- rast.bypass_vs_clip_and_viewport = 0;
rast.line_width = 1;
rast.point_smooth = 0;
rast.point_quad_rasterization = 0;
rast.line_width = 1;
rast.point_smooth = 0;
rast.point_quad_rasterization = 0;