Merge branch 'master' into glsl-pp-rework-2

Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h

1 files changed, 0 insertions, 86 deletions

diff --git a/src/gallium/state_trackers/g3dvl/vl_surface.h b/src/gallium/state_trackers/g3dvl/vl_surface.h
deleted file mode 100644
index 133e1515ef..0000000000
--- a/src/gallium/state_trackers/g3dvl/vl_surface.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef vl_surface_h
-#define vl_surface_h
-
-#include "vl_types.h"
-
-#ifdef VL_INTERNAL
-struct pipe_texture;
-
-struct vlSurface
-{
-	struct vlScreen			*screen;
-	struct vlContext		*context;
-	unsigned int			width;
-	unsigned int			height;
-	enum vlFormat			format;
-	struct pipe_texture		*texture;
-	struct pipe_fence_handle	*render_fence;
-	struct pipe_fence_handle	*disp_fence;
-};
-#endif
-
-int vlCreateSurface
-(
-	struct vlScreen *screen,
-	unsigned int width,
-	unsigned int height,
-	enum vlFormat format,
-	struct vlSurface **surface
-);
-
-int vlDestroySurface
-(
-	struct vlSurface *surface
-);
-
-int vlRenderMacroBlocksMpeg2
-(
-	struct vlMpeg2MacroBlockBatch *batch,
-	struct vlSurface *surface
-);
-
-int vlPutPicture
-(
-	struct vlSurface *surface,
-	vlNativeDrawable drawable,
-	int srcx,
-	int srcy,
-	int srcw,
-	int srch,
-	int destx,
-	int desty,
-	int destw,
-	int desth,
-	int drawable_w,
-	int drawable_h,
-	enum vlPictureType picture_type
-);
-
-int vlSurfaceGetStatus
-(
-	struct vlSurface *surface,
-	enum vlResourceStatus *status
-);
-
-int vlSurfaceFlush
-(
-	struct vlSurface *surface
-);
-
-int vlSurfaceSync
-(
-	struct vlSurface *surface
-);
-
-struct vlScreen* vlSurfaceGetScreen
-(
-	struct vlSurface *surface
-);
-
-struct vlContext* vlBindToContext
-(
-	struct vlSurface *surface,
-	struct vlContext *context
-);
-
-#endif