diff options
| author | Brian Paul <[email protected]> | 2009-12-31 09:02:27 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-31 09:02:27 -0700 |
| commit | 25024d948298a9f3f3210a0b91486f79a3917b0f (patch) | |
| tree | 5647623b9781193b7ed55c8d9233404938aeb853 /src/gallium/state_trackers/xorg/xorg_crtc.c | |
| parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff) | |
| parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_crtc.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_crtc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index c776faa53f8..e390ce29aea 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -71,6 +71,8 @@ struct crtc_private static void crtc_dpms(xf86CrtcPtr crtc, int mode) { + /* ScrnInfoPtr pScrn = crtc->scrn; */ + switch (mode) { case DPMSModeOn: case DPMSModeStandby: @@ -147,18 +149,23 @@ crtc_gamma_set(xf86CrtcPtr crtc, CARD16 * red, CARD16 * green, CARD16 * blue, static void * crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height) { + /* ScrnInfoPtr pScrn = crtc->scrn; */ + return NULL; } static PixmapPtr crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) { + /* ScrnInfoPtr pScrn = crtc->scrn; */ + return NULL; } static void crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) { + /* ScrnInfoPtr pScrn = crtc->scrn; */ } /* |