AvaloniaUI
/
angle
зеркало из https://github.com/AvaloniaUI/angle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Get Desktop GL games running on desktop frontend 

Games:
SkyEngine: Open source on github
The Deep Deep: Geoff's game

Bug: angleproject:3620
Change-Id: I5feee91a94648b385708cafe8d7412e86704ecd0
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1721189
Commit-Queue: Clemen Deng <clemendeng@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
Clemen Deng 2019-07-26 10:49:23 -04:00 коммит произвёл Commit Bot
Родитель ddbc8e4491
Коммит ca8ea0a46a
5 изменённых файлов: 250 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
include/GLSLANG/ShaderVars.h
Просмотреть файл

@ -52,6 +52,7 @@ enum class BlockType
// Required in OpenGL ES 3.1 extension GL_OES_shader_io_blocks. // Required in OpenGL ES 3.1 extension GL_OES_shader_io_blocks.
// TODO(jiawei.shao@intel.com): add BLOCK_OUT. // TODO(jiawei.shao@intel.com): add BLOCK_OUT.
// Also used in GLSL
BLOCK_IN BLOCK_IN
}; };

238
src/compiler/translator/BaseTypes.h
Просмотреть файл

@ -241,6 +241,16 @@ inline bool IsIntegerSampler(TBasicType type)
case EbtUSampler2DArray: case EbtUSampler2DArray:
case EbtUSampler2DMS: case EbtUSampler2DMS:
case EbtUSampler2DMSArray: case EbtUSampler2DMSArray:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return true; return true;
case EbtSampler2D: case EbtSampler2D:
case EbtSampler3D: case EbtSampler3D:
@ -254,6 +264,14 @@ inline bool IsIntegerSampler(TBasicType type)
case EbtSampler2DArrayShadow: case EbtSampler2DArrayShadow:
case EbtSampler2DMS: case EbtSampler2DMS:
case EbtSampler2DMSArray: case EbtSampler2DMSArray:
case EbtSampler1D:
case EbtSampler1DArray:
case EbtSampler1DArrayShadow:
case EbtSamplerBuffer:
case EbtSamplerCubeArray:
case EbtSamplerCubeArrayShadow:
case EbtSampler1DShadow:
case EbtSampler2DRectShadow:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -272,6 +290,11 @@ inline bool IsIntegerSamplerUnsigned(TBasicType type)
case EbtISampler2DArray: case EbtISampler2DArray:
case EbtISampler2DMS: case EbtISampler2DMS:
case EbtISampler2DMSArray: case EbtISampler2DMSArray:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
return false; return false;
case EbtUSampler2D: case EbtUSampler2D:
case EbtUSampler3D: case EbtUSampler3D:
@ -279,6 +302,11 @@ inline bool IsIntegerSamplerUnsigned(TBasicType type)
case EbtUSampler2DArray: case EbtUSampler2DArray:
case EbtUSampler2DMS: case EbtUSampler2DMS:
case EbtUSampler2DMSArray: case EbtUSampler2DMSArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return true; return true;
default: default:
assert(!IsIntegerSampler(type)); assert(!IsIntegerSampler(type));
@ -317,10 +345,18 @@ inline bool IsFloatImage(TBasicType type)
{ {
switch (type) switch (type)
{ {
case EbtImage1D:
case EbtImage2D: case EbtImage2D:
case EbtImage3D: case EbtImage3D:
case EbtImage1DArray:
case EbtImage2DArray: case EbtImage2DArray:
case EbtImageCube: case EbtImageCube:
case EbtImage2DMS:
case EbtImage2DMSArray:
case EbtImage2DRect:
case EbtImageCubeArray:
case EbtImageRect:
case EbtImageBuffer:
return true; return true;
default: default:
break; break;
@ -334,10 +370,18 @@ inline bool IsIntegerImage(TBasicType type)
switch (type) switch (type)
{ {
case EbtIImage1D:
case EbtIImage2D: case EbtIImage2D:
case EbtIImage3D: case EbtIImage3D:
case EbtIImage1DArray:
case EbtIImage2DArray: case EbtIImage2DArray:
case EbtIImageCube: case EbtIImageCube:
case EbtIImage2DMS:
case EbtIImage2DMSArray:
case EbtIImage2DRect:
case EbtIImageCubeArray:
case EbtIImageRect:
case EbtIImageBuffer:
return true; return true;
default: default:
break; break;
@ -351,10 +395,18 @@ inline bool IsUnsignedImage(TBasicType type)
switch (type) switch (type)
{ {
case EbtUImage1D:
case EbtUImage2D: case EbtUImage2D:
case EbtUImage3D: case EbtUImage3D:
case EbtUImage1DArray:
case EbtUImage2DArray: case EbtUImage2DArray:
case EbtUImageCube: case EbtUImageCube:
case EbtUImage2DMS:
case EbtUImage2DMSArray:
case EbtUImage2DRect:
case EbtUImageCubeArray:
case EbtUImageRect:
case EbtUImageBuffer:
return true; return true;
default: default:
break; break;
@ -373,6 +425,9 @@ inline bool IsSampler2D(TBasicType type)
case EbtISampler2D: case EbtISampler2D:
case EbtUSampler2D: case EbtUSampler2D:
case EbtSampler2DRect: case EbtSampler2DRect:
case EbtISampler2DRect:
case EbtUSampler2DRect:
case EbtSampler2DRectShadow:
case EbtSamplerExternalOES: case EbtSamplerExternalOES:
case EbtSamplerExternal2DY2YEXT: case EbtSamplerExternal2DY2YEXT:
case EbtSampler2DShadow: case EbtSampler2DShadow:
@ -394,6 +449,21 @@ inline bool IsSampler2D(TBasicType type)
case EbtUSamplerCube: case EbtUSamplerCube:
case EbtSamplerCube: case EbtSamplerCube:
case EbtSamplerCubeShadow: case EbtSamplerCubeShadow:
case EbtSampler1D:
case EbtSampler1DArray:
case EbtSampler1DArrayShadow:
case EbtSamplerBuffer:
case EbtSamplerCubeArray:
case EbtSamplerCubeArrayShadow:
case EbtSampler1DShadow:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -431,6 +501,24 @@ inline bool IsSamplerCube(TBasicType type)
case EbtUSampler2DMSArray: case EbtUSampler2DMSArray:
case EbtSampler2DShadow: case EbtSampler2DShadow:
case EbtSampler2DArrayShadow: case EbtSampler2DArrayShadow:
case EbtSampler1D:
case EbtSampler1DArray:
case EbtSampler1DArrayShadow:
case EbtSamplerBuffer:
case EbtSamplerCubeArray:
case EbtSamplerCubeArrayShadow:
case EbtSampler1DShadow:
case EbtSampler2DRectShadow:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -468,6 +556,24 @@ inline bool IsSampler3D(TBasicType type)
case EbtSampler2DShadow: case EbtSampler2DShadow:
case EbtSamplerCubeShadow: case EbtSamplerCubeShadow:
case EbtSampler2DArrayShadow: case EbtSampler2DArrayShadow:
case EbtSampler1D:
case EbtSampler1DArray:
case EbtSampler1DArrayShadow:
case EbtSamplerBuffer:
case EbtSamplerCubeArray:
case EbtSamplerCubeArrayShadow:
case EbtSampler1DShadow:
case EbtSampler2DRectShadow:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -480,6 +586,10 @@ inline bool IsSamplerArray(TBasicType type)
{ {
switch (type) switch (type)
{ {
case EbtSampler1DArray:
case EbtISampler1DArray:
case EbtUSampler1DArray:
case EbtSampler1DArrayShadow:
case EbtSampler2DArray: case EbtSampler2DArray:
case EbtISampler2DArray: case EbtISampler2DArray:
case EbtUSampler2DArray: case EbtUSampler2DArray:
@ -487,6 +597,10 @@ inline bool IsSamplerArray(TBasicType type)
case EbtISampler2DMSArray: case EbtISampler2DMSArray:
case EbtUSampler2DMSArray: case EbtUSampler2DMSArray:
case EbtSampler2DArrayShadow: case EbtSampler2DArrayShadow:
case EbtSamplerCubeArray:
case EbtISamplerCubeArray:
case EbtUSamplerCubeArray:
case EbtSamplerCubeArrayShadow:
return true; return true;
case EbtSampler2D: case EbtSampler2D:
case EbtISampler2D: case EbtISampler2D:
@ -505,6 +619,16 @@ inline bool IsSamplerArray(TBasicType type)
case EbtSampler2DMS: case EbtSampler2DMS:
case EbtISampler2DMS: case EbtISampler2DMS:
case EbtUSampler2DMS: case EbtUSampler2DMS:
case EbtSampler1D:
case EbtSamplerBuffer:
case EbtSampler1DShadow:
case EbtSampler2DRectShadow:
case EbtISampler1D:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtUSampler1D:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -517,9 +641,13 @@ inline bool IsShadowSampler(TBasicType type)
{ {
switch (type) switch (type)
{ {
case EbtSampler1DShadow:
case EbtSampler2DShadow: case EbtSampler2DShadow:
case EbtSamplerCubeShadow: case EbtSamplerCubeShadow:
case EbtSampler1DArrayShadow:
case EbtSampler2DArrayShadow: case EbtSampler2DArrayShadow:
case EbtSamplerCubeArrayShadow:
case EbtSampler2DRectShadow:
return true; return true;
case EbtISampler2D: case EbtISampler2D:
case EbtISampler3D: case EbtISampler3D:
@ -542,6 +670,20 @@ inline bool IsShadowSampler(TBasicType type)
case EbtSampler2DArray: case EbtSampler2DArray:
case EbtSampler2DMS: case EbtSampler2DMS:
case EbtSampler2DMSArray: case EbtSampler2DMSArray:
case EbtSampler1D:
case EbtSampler1DArray:
case EbtSamplerBuffer:
case EbtSamplerCubeArray:
case EbtISampler1D:
case EbtISampler1DArray:
case EbtISampler2DRect:
case EbtISamplerBuffer:
case EbtISamplerCubeArray:
case EbtUSampler1D:
case EbtUSampler1DArray:
case EbtUSampler2DRect:
case EbtUSamplerBuffer:
case EbtUSamplerCubeArray:
return false; return false;
default: default:
assert(!IsSampler(type)); assert(!IsSampler(type));
@ -557,6 +699,12 @@ inline bool IsImage2D(TBasicType type)
case EbtImage2D: case EbtImage2D:
case EbtIImage2D: case EbtIImage2D:
case EbtUImage2D: case EbtUImage2D:
case EbtImage2DRect:
case EbtIImage2DRect:
case EbtUImage2DRect:
case EbtImage2DMS:
case EbtIImage2DMS:
case EbtUImage2DMS:
return true; return true;
case EbtImage3D: case EbtImage3D:
case EbtIImage3D: case EbtIImage3D:
@ -567,6 +715,24 @@ inline bool IsImage2D(TBasicType type)
case EbtImageCube: case EbtImageCube:
case EbtIImageCube: case EbtIImageCube:
case EbtUImageCube: case EbtUImageCube:
case EbtImage1D:
case EbtIImage1D:
case EbtUImage1D:
case EbtImage1DArray:
case EbtIImage1DArray:
case EbtUImage1DArray:
case EbtImage2DMSArray:
case EbtIImage2DMSArray:
case EbtUImage2DMSArray:
case EbtImageCubeArray:
case EbtIImageCubeArray:
case EbtUImageCubeArray:
case EbtImageRect:
case EbtIImageRect:
case EbtUImageRect:
case EbtImageBuffer:
case EbtIImageBuffer:
case EbtUImageBuffer:
return false; return false;
default: default:
assert(!IsImage(type)); assert(!IsImage(type));
@ -592,6 +758,30 @@ inline bool IsImage3D(TBasicType type)
case EbtImageCube: case EbtImageCube:
case EbtIImageCube: case EbtIImageCube:
case EbtUImageCube: case EbtUImageCube:
case EbtImage1D:
case EbtIImage1D:
case EbtUImage1D:
case EbtImage1DArray:
case EbtIImage1DArray:
case EbtUImage1DArray:
case EbtImage2DMS:
case EbtIImage2DMS:
case EbtUImage2DMS:
case EbtImage2DMSArray:
case EbtIImage2DMSArray:
case EbtUImage2DMSArray:
case EbtImage2DRect:
case EbtIImage2DRect:
case EbtUImage2DRect:
case EbtImageCubeArray:
case EbtIImageCubeArray:
case EbtUImageCubeArray:
case EbtImageRect:
case EbtIImageRect:
case EbtUImageRect:
case EbtImageBuffer:
case EbtIImageBuffer:
case EbtUImageBuffer:
return false; return false;
default: default:
assert(!IsImage(type)); assert(!IsImage(type));
@ -607,6 +797,9 @@ inline bool IsImage2DArray(TBasicType type)
case EbtImage2DArray: case EbtImage2DArray:
case EbtIImage2DArray: case EbtIImage2DArray:
case EbtUImage2DArray: case EbtUImage2DArray:
case EbtImage2DMSArray:
case EbtIImage2DMSArray:
case EbtUImage2DMSArray:
return true; return true;
case EbtImage2D: case EbtImage2D:
case EbtIImage2D: case EbtIImage2D:
@ -617,6 +810,27 @@ inline bool IsImage2DArray(TBasicType type)
case EbtImageCube: case EbtImageCube:
case EbtIImageCube: case EbtIImageCube:
case EbtUImageCube: case EbtUImageCube:
case EbtImage1D:
case EbtIImage1D:
case EbtUImage1D:
case EbtImage1DArray:
case EbtIImage1DArray:
case EbtUImage1DArray:
case EbtImage2DMS:
case EbtIImage2DMS:
case EbtUImage2DMS:
case EbtImage2DRect:
case EbtIImage2DRect:
case EbtUImage2DRect:
case EbtImageCubeArray:
case EbtIImageCubeArray:
case EbtUImageCubeArray:
case EbtImageRect:
case EbtIImageRect:
case EbtUImageRect:
case EbtImageBuffer:
case EbtIImageBuffer:
case EbtUImageBuffer:
return false; return false;
default: default:
assert(!IsImage(type)); assert(!IsImage(type));
@ -642,6 +856,30 @@ inline bool IsImageCube(TBasicType type)
case EbtImage2DArray: case EbtImage2DArray:
case EbtIImage2DArray: case EbtIImage2DArray:
case EbtUImage2DArray: case EbtUImage2DArray:
case EbtImage1D:
case EbtIImage1D:
case EbtUImage1D:
case EbtImage1DArray:
case EbtIImage1DArray:
case EbtUImage1DArray:
case EbtImage2DMS:
case EbtIImage2DMS:
case EbtUImage2DMS:
case EbtImage2DMSArray:
case EbtIImage2DMSArray:
case EbtUImage2DMSArray:
case EbtImage2DRect:
case EbtIImage2DRect:
case EbtUImage2DRect:
case EbtImageCubeArray:
case EbtIImageCubeArray:
case EbtUImageCubeArray:
case EbtImageRect:
case EbtIImageRect:
case EbtUImageRect:
case EbtImageBuffer:
case EbtIImageBuffer:
case EbtUImageBuffer:
return false; return false;
default: default:
assert(!IsImage(type)); assert(!IsImage(type));

9
src/compiler/translator/glslang_tab.cpp
Просмотреть файл

@ -408,20 +408,23 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
} \ } \
} while (0) } while (0)
// TODO(http://anglebug.com/3819): Update for GL version specific validation
#define ES2_ONLY(S, L) do { \ #define ES2_ONLY(S, L) do { \
if (context->getShaderVersion() != 100) { \ if (context->getShaderVersion() != 100 && !IsDesktopGLSpec(context->getShaderSpec())) { \
context->error(L, " supported in GLSL ES 1.00 only", S); \ context->error(L, " supported in GLSL ES 1.00 only", S); \
} \ } \
} while (0) } while (0)
// TODO(http://anglebug.com/3819): Update for GL version specific validation
#define ES3_OR_NEWER(TOKEN, LINE, REASON) do { \ #define ES3_OR_NEWER(TOKEN, LINE, REASON) do { \
if (context->getShaderVersion() < 300) { \ if (context->getShaderVersion() < 300 && !IsDesktopGLSpec(context->getShaderSpec())) { \
context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN); \ context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN); \
} \ } \
} while (0) } while (0)
// TODO(http://anglebug.com/3819): Update for GL version specific validation
#define ES3_1_ONLY(TOKEN, LINE, REASON) do { \ #define ES3_1_ONLY(TOKEN, LINE, REASON) do { \
if (context->getShaderVersion() != 310) { \ if (context->getShaderVersion() != 310 && !IsDesktopGLSpec(context->getShaderSpec())) { \
context->error(LINE, REASON " supported in GLSL ES 3.10 only", TOKEN); \ context->error(LINE, REASON " supported in GLSL ES 3.10 only", TOKEN); \
} \ } \
} while (0) } while (0)

3
src/libANGLE/Compiler.cpp
Просмотреть файл

@ -65,8 +65,9 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const State &state)
mOutputType(mImplementation->getTranslatorOutputType()), mOutputType(mImplementation->getTranslatorOutputType()),
mResources() mResources()
{ {
// TODO(http://anglebug.com/3819): Update for GL version specific validation
ASSERT(state.getClientMajorVersion() == 1 || state.getClientMajorVersion() == 2 || ASSERT(state.getClientMajorVersion() == 1 || state.getClientMajorVersion() == 2 ||
state.getClientMajorVersion() == 3); state.getClientMajorVersion() == 3 || state.getClientMajorVersion() == 4);
const gl::Caps &caps = state.getCaps(); const gl::Caps &caps = state.getCaps();
const gl::Extensions &extensions = state.getExtensions(); const gl::Extensions &extensions = state.getExtensions();

4
src/libGL/entry_points_wgl.cpp
Просмотреть файл

@ -70,12 +70,14 @@ int GL_APIENTRY wglDescribePixelFormat(HDC hdc, int ipfd, UINT cjpfd, PIXELFORMA
ppfd->dwFlags = ppfd->dwFlags | PFD_GENERIC_ACCELERATED; ppfd->dwFlags = ppfd->dwFlags | PFD_GENERIC_ACCELERATED;
ppfd->dwFlags = ppfd->dwFlags | PFD_DOUBLEBUFFER; ppfd->dwFlags = ppfd->dwFlags | PFD_DOUBLEBUFFER;
ppfd->iPixelType = PFD_TYPE_RGBA; ppfd->iPixelType = PFD_TYPE_RGBA;
ppfd->cColorBits = 24;
ppfd->cRedBits = 8; ppfd->cRedBits = 8;
ppfd->cGreenBits = 8; ppfd->cGreenBits = 8;
ppfd->cBlueBits = 8; ppfd->cBlueBits = 8;
ppfd->cAlphaBits = 8; ppfd->cAlphaBits = 8;
ppfd->cDepthBits = 24; ppfd->cDepthBits = 24;
ppfd->cStencilBits = 8; ppfd->cStencilBits = 8;
ppfd->nVersion = 1;
} }
return 1; return 1;
} }
@ -159,7 +161,7 @@ HGLRC GL_APIENTRY wglCreateContext(HDC hDc)
"wglCreateContext", display, nullptr); "wglCreateContext", display, nullptr);
// Initialize context // Initialize context
EGLint contextAttibutes[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_CONTEXT_MINOR_VERSION, 3, EGLint contextAttibutes[] = {EGL_CONTEXT_CLIENT_VERSION, 4, EGL_CONTEXT_MINOR_VERSION, 6,
EGL_NONE}; EGL_NONE};
gl::Context *sharedGLContext = static_cast<gl::Context *>(nullptr); gl::Context *sharedGLContext = static_cast<gl::Context *>(nullptr);