Correct a couple of comments.

[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 e2c67c16f2f6593c859be83644c17f7269f16fad..068c0410da4815ea2c88e7d075592c7c30be03e4 100644 (file)
--- a/src/mesa/drivers/dri/sis/sis_screen.h
+++ b/src/mesa/drivers/dri/sis/sis_screen.h
@@ -17,10 +17,9 @@ Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN 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.
+ERIC ANHOLT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+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$ */
@@ -34,7 +33,7 @@ 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;
@@ -55,6 +54,9 @@ typedef struct {
    __DRIscreenPrivate *driScreen;
    unsigned int sarea_priv_offset;
 
+   /* Configuration cache with default values for all contexts */
+   driOptionCache optionCache;
+
 } sisScreenRec, *sisScreenPtr;
 
 #endif