Changeset 82083 in vbox
- Timestamp:
- Nov 21, 2019 4:26:41 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
r82081 r82083 809 809 if ( pThis->svga.fEnabled 810 810 && pThis->svga.uWidth != VMSVGA_VAL_UNINITIALIZED) 811 {812 811 *pu32 = pThis->svga.uWidth; 813 }814 812 else 815 813 { … … 828 826 if ( pThis->svga.fEnabled 829 827 && pThis->svga.uHeight != VMSVGA_VAL_UNINITIALIZED) 830 {831 828 *pu32 = pThis->svga.uHeight; 832 }833 829 else 834 830 { … … 857 853 switch (pThis->svga.uBpp) 858 854 { 859 case 15:860 case 16:861 case 24:862 *pu32 = pThis->svga.uBpp;863 break;864 865 default:866 case 32:867 *pu32 = 24; /* The upper 8 bits are either alpha bits or not used. */868 break;855 case 15: 856 case 16: 857 case 24: 858 *pu32 = pThis->svga.uBpp; 859 break; 860 861 default: 862 case 32: 863 *pu32 = 24; /* The upper 8 bits are either alpha bits or not used. */ 864 break; 869 865 } 870 866 break; … … 874 870 if ( pThis->svga.fEnabled 875 871 && pThis->svga.uBpp != VMSVGA_VAL_UNINITIALIZED) 876 {877 872 *pu32 = pThis->svga.uBpp; 878 }879 873 else 880 874 { … … 891 885 if ( pThis->svga.fEnabled 892 886 && pThis->svga.uBpp != VMSVGA_VAL_UNINITIALIZED) 893 {894 887 *pu32 = (pThis->svga.uBpp + 7) & ~7; 895 }896 888 else 897 889 { … … 983 975 if ( pThis->svga.fEnabled 984 976 && pThis->svga.cbScanline) 985 {986 977 *pu32 = pThis->svga.cbScanline; 987 }988 978 else 989 979 { … … 5815 5805 { 5816 5806 /* Register caps. */ 5817 pThis->svga.u32RegCaps = 5818 5819 5820 5821 5822 5823 5824 5825 5826 5807 pThis->svga.u32RegCaps = SVGA_CAP_GMR 5808 | SVGA_CAP_GMR2 5809 | SVGA_CAP_CURSOR 5810 | SVGA_CAP_CURSOR_BYPASS_2 5811 | SVGA_CAP_EXTENDED_FIFO 5812 | SVGA_CAP_IRQMASK 5813 | SVGA_CAP_PITCHLOCK 5814 | SVGA_CAP_TRACES 5815 | SVGA_CAP_SCREEN_OBJECT_2 5816 | SVGA_CAP_ALPHA_CURSOR; 5827 5817 # ifdef VBOX_WITH_VMSVGA3D 5828 5818 pThis->svga.u32RegCaps |= SVGA_CAP_3D; … … 5833 5823 5834 5824 /* Setup FIFO capabilities. */ 5835 pThis->svga.pFIFOR3[SVGA_FIFO_CAPABILITIES] = 5836 5837 5838 5839 5840 5841 5825 pThis->svga.pFIFOR3[SVGA_FIFO_CAPABILITIES] = SVGA_FIFO_CAP_FENCE 5826 | SVGA_FIFO_CAP_CURSOR_BYPASS_3 5827 | SVGA_FIFO_CAP_GMR2 5828 | SVGA_FIFO_CAP_3D_HWVERSION_REVISED 5829 | SVGA_FIFO_CAP_SCREEN_OBJECT_2 5830 | SVGA_FIFO_CAP_RESERVE 5831 | SVGA_FIFO_CAP_PITCHLOCK; 5842 5832 5843 5833 /* Valid with SVGA_FIFO_CAP_SCREEN_OBJECT_2 */
Note:
See TracChangeset
for help on using the changeset viewer.