Fix Chrome build.
Change-Id: I25567211a4603713ad89a1eb58aa3306b11be0ab
Reviewed-on: https://swiftshader-review.googlesource.com/15689
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/OpenGL/common/Image.cpp b/src/OpenGL/common/Image.cpp
index d9cb28a..9fbc2e5 100644
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -49,7 +49,6 @@
HalfFloatRGB,
RGBA4444,
RGBA5551,
- RGB10A2UI,
R11G11B10F,
RGB9E5,
D16,
@@ -254,22 +253,6 @@
}
template<>
- void LoadImageRow<RGB10A2UI>(const unsigned char *source, unsigned char *dest, GLint xoffset, GLsizei width)
- {
- const unsigned int *source1010102U = reinterpret_cast<const unsigned int*>(source);
- unsigned short *dest16U = reinterpret_cast<unsigned short*>(dest + xoffset * 8);
-
- for(int x = 0; x < width; x++)
- {
- unsigned int rgba = source1010102U[x];
- dest16U[4 * x + 0] = (rgba & 0x000003FF);
- dest16U[4 * x + 1] = (rgba & 0x000FFC00) >> 10;
- dest16U[4 * x + 2] = (rgba & 0x3FF00000) >> 20;
- dest16U[4 * x + 3] = (rgba & 0xC0000000) >> 30;
- }
- }
-
- template<>
void LoadImageRow<R11G11B10F>(const unsigned char *source, unsigned char *dest, GLint xoffset, GLsizei width)
{
const sw::R11G11B10F *sourceRGB = reinterpret_cast<const sw::R11G11B10F*>(source);
diff --git a/src/OpenGL/compiler/preprocessor/BUILD.gn b/src/OpenGL/compiler/preprocessor/BUILD.gn
index 7c8c2e4..e947c31 100644
--- a/src/OpenGL/compiler/preprocessor/BUILD.gn
+++ b/src/OpenGL/compiler/preprocessor/BUILD.gn
@@ -27,8 +27,8 @@
swiftshader_source_set("swiftshader_opengl_preprocessor") {
sources = [
- "Diagnostics.cpp",
- "DirectiveHandler.cpp",
+ "DiagnosticsBase.cpp",
+ "DirectiveHandlerBase.cpp",
"DirectiveParser.cpp",
"ExpressionParser.cpp",
"Input.cpp",
