Difference for 2d/bitblt.c from version 1.6 to 1.7


version 1.6 version 1.7
Line 19
 
Line 19
  * Routines for bitblt's.   * Routines for bitblt's.
  *   *
  * $Log$   * $Log$
    * Revision 1.7  1999/10/18 07:26:38  donut
    * beginning work on bitblt with source==BM_OGL, fixes squished bitblts, better support for alternate texture formats, support for driver specific hacks, etc
    *
  * Revision 1.6  1999/10/07 02:27:13  donut   * Revision 1.6  1999/10/07 02:27:13  donut
  * OGL includes to remove warnings   * OGL includes to remove warnings
  *   *
Line 718
 
Line 721
  }   }
  if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_LINEAR ))   if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_LINEAR ))
  {   {
    ogl_ubitblt_tolinear(w, h, dx, dy, sx, sy, src, dest);
  return;   return;
  }   }
  if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_OGL ))   if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_OGL ))
  {   {
    ogl_ubitblt_copy(w, h, dx, dy, sx, sy, src, dest);
  return;   return;
  }   }
 #endif  #endif
Line 833
 
Line 838
  ogl_ubitblt(w, h, dx, dy, sx, sy, src, dest);   ogl_ubitblt(w, h, dx, dy, sx, sy, src, dest);
  return;   return;
  }   }
  if ( (src->bm_type == BM_OGL))   if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_LINEAR ))
    {
    ogl_ubitblt_tolinear(w, h, dx, dy, sx, sy, src, dest);
    return;
    }
    if ( (src->bm_type == BM_OGL) && (dest->bm_type == BM_OGL ))
    {
    ogl_ubitblt_copy(w, h, dx, dy, sx, sy, src, dest);
  return;   return;
    }
 #endif  #endif
 #ifdef D1XD3D  #ifdef D1XD3D
  if ( (src->bm_type == BM_LINEAR) && (dest->bm_type == BM_DIRECTX ))   if ( (src->bm_type == BM_LINEAR) && (dest->bm_type == BM_DIRECTX ))

Legend:
line(s) removed in v.1.6 
line(s) changed
 line(s) added in v.1.7