i965: Emit zero initialization for NV VP temporaries as required.

[mesa.git] / src / mesa / drivers / dri / sis / sis_screen.h

diff --git a/src/mesa/drivers/dri/sis/sis_screen.h b/src/mesa/drivers/dri/sis/sis_screen.h
index 452278264f1890b719d122bf4d8e18d2fc1a3a85..07c29cfa09843f9946872d388bffdfe1cb48bd77 100644 (file)
--- a/src/mesa/drivers/dri/sis/sis_screen.h
+++ b/src/mesa/drivers/dri/sis/sis_screen.h
@@ -22,7 +22,6 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86$ */
 
 /*
  * Authors:
@@ -33,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __SIS_SCREEN_H
 
 typedef struct {
-   drmHandle handle;                   /* Handle to the DRM region */
+   drm_handle_t handle;                        /* Handle to the DRM region */
    drmSize size;                       /* Size of the DRM region */
    drmAddress map;                     /* Mapping of the DRM region */
 } sisRegionRec2, *sisRegionPtr2;
@@ -41,12 +40,12 @@ typedef struct {
 typedef struct {
    sisRegionRec2 mmio;
    sisRegionRec2 agp;
+   unsigned long agpBaseOffset;
 
    unsigned int AGPCmdBufOffset;
    unsigned int AGPCmdBufSize;
 
    int deviceID;
-   int irqEnabled;
 
    int cpp;
    unsigned int screenX, screenY;