Merge branch 'master' into gallium-sampler-view

Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/SConscript
	src/gallium/auxiliary/tgsi/tgsi_exec.c
	src/gallium/auxiliary/util/u_blitter.c
	src/gallium/drivers/i915/i915_context.h
	src/gallium/drivers/i965/brw_context.h
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/nv50/nv50_context.h
	src/gallium/drivers/nv50/nv50_state_validate.c
	src/gallium/drivers/nv50/nv50_tex.c
	src/gallium/drivers/r300/r300_blit.c
	src/gallium/drivers/r300/r300_context.h
	src/gallium/drivers/r300/r300_emit.c
	src/gallium/drivers/r300/r300_state.c
	src/gallium/drivers/softpipe/sp_context.h
	src/gallium/drivers/svga/svga_context.h
	src/gallium/drivers/svga/svga_pipe_sampler.c

1 files changed, 0 insertions, 126 deletions

diff --git a/src/glut/os2/glut_winmisc.cpp b/src/glut/os2/glut_winmisc.cpp
deleted file mode 100644
index 7cd6699924..0000000000
--- a/src/glut/os2/glut_winmisc.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994.  */
-
-/* This program is freely distributable without licensing fees
-   and is provided without guarantee or warrantee expressed or
-   implied. This program is -not- in the public domain. */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-
-#include "glutint.h"
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutSetWindowTitle(const char *title)
-{
-#if defined(__OS2PM__)
-   __glutSetWindowText(__glutCurrentWindow->win, (char *)title);
-
-#else
-  XTextProperty textprop;
-
-  assert(!__glutCurrentWindow->parent);
-  IGNORE_IN_GAME_MODE();
-  textprop.value = (unsigned char *) title;
-  textprop.encoding = XA_STRING;
-  textprop.format = 8;
-  textprop.nitems = strlen(title);
-  XSetWMName(__glutDisplay,
-    __glutCurrentWindow->win, &textprop);
-  XFlush(__glutDisplay);
-#endif
-}
-
-void GLUTAPIENTRY
-glutSetIconTitle(const char *title)
-{
-#if defined(__OS2PM__)
-//todo ?
-#else
-
-  XTextProperty textprop;
-
-  assert(!__glutCurrentWindow->parent);
-  IGNORE_IN_GAME_MODE();
-  textprop.value = (unsigned char *) title;
-  textprop.encoding = XA_STRING;
-  textprop.format = 8;
-  textprop.nitems = strlen(title);
-  XSetWMIconName(__glutDisplay,
-    __glutCurrentWindow->win, &textprop);
-  XFlush(__glutDisplay);
-#endif
-}
-
-void GLUTAPIENTRY
-glutPositionWindow(int x, int y)
-{
-  IGNORE_IN_GAME_MODE();
-  __glutCurrentWindow->desiredX = x;
-  __glutCurrentWindow->desiredY = y;
-  __glutCurrentWindow->desiredConfMask |= CWX | CWY;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
-}
-
-void GLUTAPIENTRY
-glutReshapeWindow(int w, int h)
-{
-  IGNORE_IN_GAME_MODE();
-  if (w <= 0 || h <= 0)
-    __glutWarning("glutReshapeWindow: non-positive width or height not allowed");
-
-  __glutCurrentWindow->desiredWidth = w;
-  __glutCurrentWindow->desiredHeight = h;
-  __glutCurrentWindow->desiredConfMask |= CWWidth | CWHeight;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
-}
-
-void GLUTAPIENTRY
-glutPopWindow(void)
-{
-  IGNORE_IN_GAME_MODE();
-  __glutCurrentWindow->desiredStack = Above;
-  __glutCurrentWindow->desiredConfMask |= CWStackMode;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
-}
-
-void GLUTAPIENTRY
-glutPushWindow(void)
-{
-  IGNORE_IN_GAME_MODE();
-  __glutCurrentWindow->desiredStack = Below;
-  __glutCurrentWindow->desiredConfMask |= CWStackMode;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
-}
-
-void GLUTAPIENTRY
-glutIconifyWindow(void)
-{
-  IGNORE_IN_GAME_MODE();
-  assert(!__glutCurrentWindow->parent);
-  __glutCurrentWindow->desiredMapState = IconicState;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
-}
-
-void GLUTAPIENTRY
-glutShowWindow(void)
-{
-  IGNORE_IN_GAME_MODE();
-  __glutCurrentWindow->desiredMapState = NormalState;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
-}
-
-void GLUTAPIENTRY
-glutHideWindow(void)
-{
-  IGNORE_IN_GAME_MODE();
-  __glutCurrentWindow->desiredMapState = WithdrawnState;
-  __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
-}
-
-/* ENDCENTRY */