← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nvidia-settings-updates/saucy

« back to all changes in this revision

Viewing changes to src/libXNVCtrlAttributes/NvCtrlAttributes.c

  • Committer: Package Import Robot
  • Author(s): Alberto Milone
  • Date: 2012-06-25 16:39:50 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20120625163950-qsci6udwk8mbyrdu
Tags: 302.17-0ubuntu1
* New upstream release.
* Refresh 04_nvidia-settings_natty_ftbs.patch.
* Drop 02_nvidia-settings-format-string.patch which
  is now upstream.
* debian/rules:
  - Make sure to install the new sources correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libXNVCtrlAttributes/NvCtrlAttributes.c
570
570
        return status;
571
571
    }
572
572
 
573
 
    if ((attr >= NV_CTRL_ATTR_XRANDR_BASE) &&
574
 
        (attr <= NV_CTRL_ATTR_XRANDR_LAST_ATTRIBUTE)) {
575
 
        status = NvCtrlXrandrGetAttribute(h, attr, &value_32);
576
 
        *val = value_32;
577
 
        return status;
578
 
    }
579
 
 
580
573
    return NvCtrlNoAttribute;
581
574
    
582
575
} /* NvCtrlGetDisplayAttribute64() */
614
607
        
615
608
        return NvCtrlXvSetAttribute(h, attr, val);
616
609
    }
617
 
    
618
 
    if ((attr >= NV_CTRL_ATTR_XRANDR_BASE) &&
619
 
        (attr <= NV_CTRL_ATTR_XRANDR_LAST_ATTRIBUTE)) {
620
 
        
621
 
        return NvCtrlXrandrSetAttribute(h, attr, val);
622
 
    }
623
610
 
624
611
    return NvCtrlNoAttribute;
625
612
 
931
918
} /* NvCtrlAttributeClose() */
932
919
 
933
920
 
934
 
ReturnStatus
935
 
NvCtrlXrandrSetScreenMode (NvCtrlAttributeHandle *handle,
936
 
                           int width, int height, int refresh)
937
 
{
938
 
    return NvCtrlXrandrSetScreenMagicMode
939
 
        ((NvCtrlAttributePrivateHandle *)handle, width, height, refresh);
940
 
} /* NvCtrlXrandrSetScreenMode() */
941
 
 
942
 
 
943
 
ReturnStatus
944
 
NvCtrlXrandrGetScreenMode (NvCtrlAttributeHandle *handle,
945
 
                           int *width, int *height, int *refresh)
946
 
{
947
 
    return NvCtrlXrandrGetScreenMagicMode
948
 
        ((NvCtrlAttributePrivateHandle *)handle, width, height, refresh);
949
 
} /* NvCtrlXrandrGetScreenMode() */
950
 
 
951
 
 
952
921
/*
953
922
 * NvCtrlGetMultisampleModeName() - lookup a string desribing the
954
923
 * NV-CONTROL constant.
971
940
        "8x (8xMS)",           /* FSAA_MODE_8xQ   */
972
941
        "16x (4xSS, 4xMS)",    /* FSAA_MODE_16xS  */
973
942
        "16x (8xMS, 8xCS)",    /* FSAA_MODE_16xQ  */
974
 
        "32x (4xSS, 8xMS)"     /* FSAA_MODE_32xS  */
 
943
        "32x (4xSS, 8xMS)",    /* FSAA_MODE_32xS  */
 
944
        "32x (8xMS, 24xCS)",   /* FSAA_MODE_32x   */
 
945
        "64x (16xSS, 4xMS)",   /* FSAA_MODE_64xS  */
975
946
    };
976
947
 
977
948
    if ((multisample_mode < NV_CTRL_FSAA_MODE_NONE) ||