/[qemu]/qemu/hw/cirrus_vga_rop2.h
ViewVC logotype

Diff of /qemu/hw/cirrus_vga_rop2.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by bellard, Sun Apr 17 17:56:18 2005 UTC revision 1.6 by bellard, Tue Apr 26 20:49:17 2005 UTC
# Line 47  glue(glue(glue(cirrus_patternfill_, ROP_ Line 47  glue(glue(glue(cirrus_patternfill_, ROP_
47      int x, y, pattern_y, pattern_pitch, pattern_x;      int x, y, pattern_y, pattern_pitch, pattern_x;
48      unsigned int col;      unsigned int col;
49      const uint8_t *src1;      const uint8_t *src1;
50    #if DEPTH == 24
51        int skipleft = s->gr[0x2f] & 0x1f;
52    #else
53      int skipleft = (s->gr[0x2f] & 0x07) * (DEPTH / 8);      int skipleft = (s->gr[0x2f] & 0x07) * (DEPTH / 8);
54    #endif
55    
56  #if DEPTH == 8  #if DEPTH == 8
57      pattern_pitch = 8;      pattern_pitch = 8;
# Line 100  glue(glue(glue(cirrus_colorexpand_transp Line 104  glue(glue(glue(cirrus_colorexpand_transp
104      unsigned int col;      unsigned int col;
105      unsigned bitmask;      unsigned bitmask;
106      unsigned index;      unsigned index;
107    #if DEPTH == 24
108        int dstskipleft = s->gr[0x2f] & 0x1f;
109        int srcskipleft = dstskipleft / 3;
110    #else
111      int srcskipleft = s->gr[0x2f] & 0x07;      int srcskipleft = s->gr[0x2f] & 0x07;
112      int dstskipleft = srcskipleft * (DEPTH / 8);      int dstskipleft = srcskipleft * (DEPTH / 8);
113    #endif
114    
115      if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {      if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {
116          bits_xor = 0xff;          bits_xor = 0xff;
# Line 178  glue(glue(glue(cirrus_colorexpand_patter Line 187  glue(glue(glue(cirrus_colorexpand_patter
187      int x, y, bitpos, pattern_y;      int x, y, bitpos, pattern_y;
188      unsigned int bits, bits_xor;      unsigned int bits, bits_xor;
189      unsigned int col;      unsigned int col;
190    #if DEPTH == 24
191        int dstskipleft = s->gr[0x2f] & 0x1f;
192        int srcskipleft = dstskipleft / 3;
193    #else
194      int srcskipleft = s->gr[0x2f] & 0x07;      int srcskipleft = s->gr[0x2f] & 0x07;
195      int dstskipleft = srcskipleft * (DEPTH / 8);      int dstskipleft = srcskipleft * (DEPTH / 8);
196    #endif
197    
198      if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {      if (s->cirrus_blt_modeext & CIRRUS_BLTMODEEXT_COLOREXPINV) {
199          bits_xor = 0xff;          bits_xor = 0xff;

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26