VESA: move pixel formatting into __vesacon_copy_to_screen()syslinux-3.62-pre5

Make pixel formatting an integral part of __vesacon_copy_to_screen().
In order to cut down on the dispatch overhead, make the formatting
functions contain the pixel loop, so we only do indirect dispatch
twice per pixel row - once for the formatting and once for copying to
the screen.

1 files changed, 101 insertions, 0 deletions

diff --git a/com32/lib/sys/vesa/fmtpixel.c b/com32/lib/sys/vesa/fmtpixel.c
new file mode 100644
index 00000000..74c79ef1
--- /dev/null
+++ b/com32/lib/sys/vesa/fmtpixel.c
@@ -0,0 +1,101 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2006-2008 H. Peter Anvin - All Rights Reserved
+ *
+ *   Permission is hereby granted, free of charge, to any person
+ *   obtaining a copy of this software and associated documentation
+ *   files (the "Software"), to deal in the Software without
+ *   restriction, including without limitation the rights to use,
+ *   copy, modify, merge, publish, distribute, sublicense, and/or
+ *   sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following
+ *   conditions:
+ *
+ *   The above copyright notice and this permission notice shall
+ *   be included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * fmtpixel.c
+ *
+ * Functions to format a single pixel
+ */
+
+#include <inttypes.h>
+#include "video.h"
+
+/* Format a pixel and return the advanced pointer.
+   THIS FUNCTION IS ALLOWED TO WRITE BEYOND THE END OF THE PIXEL. */
+
+static inline uint32_t *copy_dword(uint32_t *dst, const uint32_t *src,
+				   size_t dword_count)
+{
+  asm volatile("cld; rep; movsl"
+	       : "+D" (dst), "+S" (src), "+c" (dword_count));
+  return dst;			/* Updated destination pointer */
+}
+
+static void *format_pxf_bgra32(void *ptr, const uint32_t *p, size_t n)
+{
+  return copy_dword(ptr, p, n);
+}
+
+static void *format_pxf_bgr24(void *ptr, const uint32_t *p, size_t n)
+{
+  char *q = ptr;
+
+  while (n--) {
+    *(uint32_t *)q = *p++;
+    q += 3;
+  }
+  return q;
+}
+
+static void *format_pxf_le_rgb16_565(void *ptr, const uint32_t *p, size_t n)
+{
+  uint32_t bgra;
+  uint16_t *q = ptr;
+
+  while (n--) {
+    bgra = *p++;
+    *q++ =
+      ((bgra >> 3) & 0x1f) +
+      ((bgra >> (2+8-5)) & (0x3f << 5)) +
+      ((bgra >> (3+16-11)) & (0x1f << 11));
+  }
+  return q;
+}
+
+static void *format_pxf_le_rgb15_555(void *ptr, const uint32_t *p, size_t n)
+{
+  uint32_t bgra;
+  uint16_t *q = ptr;
+
+  while (n--) {
+    bgra = *p++;
+    *q++ =
+      ((bgra >> 3) & 0x1f) +
+      ((bgra >> (2+8-5)) & (0x1f << 5)) +
+      ((bgra >> (3+16-10)) & (0x1f << 10));
+  }
+  return q;
+}
+
+__vesacon_format_pixels_t __vesacon_format_pixels;
+
+const __vesacon_format_pixels_t __vesacon_format_pixels_list[PXF_NONE] = {
+  [PXF_BGRA32]       = format_pxf_bgra32,
+  [PXF_BGR24]        = format_pxf_bgr24,
+  [PXF_LE_RGB16_565] = format_pxf_le_rgb16_565,
+  [PXF_LE_RGB15_555] = format_pxf_le_rgb15_555,
+};