diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2012-05-19 08:33:15 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2012-05-19 08:33:15 -0700 |
| commit | ffa5183362ed4ace5b1cfd031a272f72e7d68c1b (patch) | |
| tree | 7358e2b05ec99914052a10c32f7832e109d76890 | |
| parent | ff0cf8a6745037489242150828e469cef4f97d86 (diff) | |
| -rw-r--r-- | src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c index 633c078..c445a6a 100644 --- a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c +++ b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c @@ -41,8 +41,6 @@ static unsigned short computeVal(NvCtrlAttributePrivateHandle *, #define BLUE BLUE_CHANNEL_INDEX -#if defined(X_XF86VidModeGetGammaRampSize) - /* * XXX The XF86VidMode extension can block remote clients. * Unfortunately, there doesn't seem to be a good way to determine if @@ -72,9 +70,6 @@ static int vidModeErrorHandler(Display *dpy, XErrorEvent *err) return 1; } -#endif /* X_XF86VidModeGetGammaRampSize */ - - NvCtrlVidModeAttributes * @@ -89,8 +84,6 @@ NvCtrlInitVidModeAttributes(NvCtrlAttributePrivateHandle *h) goto failed; } -#if defined(X_XF86VidModeGetGammaRampSize) - ret = XF86VidModeQueryExtension(h->dpy, &event, &vidModeErrorBase); if (ret != True) goto failed; @@ -190,12 +183,6 @@ NvCtrlInitVidModeAttributes(NvCtrlAttributePrivateHandle *h) return (vm); -#else - -#warning Old xf86vmode.h; dynamic gamma ramp support will not be compiled. - -#endif - blocked: nv_warning_msg("The VidMode extension is blocked for remote " @@ -272,8 +259,6 @@ ReturnStatus NvCtrlSetColorAttributes(NvCtrlAttributeHandle *handle, int i, ch; Bool ret; -#if defined(X_XF86VidModeGetGammaRampSize) - NvCtrlAttributePrivateHandle *h; h = (NvCtrlAttributePrivateHandle *) handle; @@ -340,10 +325,6 @@ ReturnStatus NvCtrlSetColorAttributes(NvCtrlAttributeHandle *handle, if (ret != True) return NvCtrlError; return NvCtrlSuccess; -#else - return NvCtrlMissingExtension; - -#endif /* X_XF86VidModeGetGammaRampSize */ } /* NvCtrlSetColorAttribute() */ @@ -353,8 +334,6 @@ ReturnStatus NvCtrlGetColorRamp(NvCtrlAttributeHandle *handle, unsigned short **lut, int *n) { -#if defined(X_XF86VidModeGetGammaRampSize) - NvCtrlAttributePrivateHandle *h; h = (NvCtrlAttributePrivateHandle *) handle; @@ -375,9 +354,6 @@ ReturnStatus NvCtrlGetColorRamp(NvCtrlAttributeHandle *handle, } return NvCtrlSuccess; -#else - return NvCtrlMissingExtension; -#endif } |