Skip to content

Commit

Permalink
Update to @google Chrome 103.0.5060
Browse files Browse the repository at this point in the history
  • Loading branch information
@halx99
halx99 committed May 30, 2022
1 parent 49c415d commit feef417
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 18 deletions.
2 changes: 1 addition & 1 deletion angle/build/config/win/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ config("runtime_library") {
# manually override this config for their compiles.
config("winver") {
defines = [
"NTDDI_VERSION=NTDDI_WIN10_NI",
"NTDDI_VERSION=NTDDI_WIN10_CO",

# We can't say `=_WIN32_WINNT_WIN10` here because some files do
# `#if WINVER < 0x0600` without including windows.h before,
Expand Down
11 changes: 10 additions & 1 deletion angle/build/toolchain/win/setup_toolchain.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ def _ExtractImportantEnvironment(output_of_set):
# path. Add the path to this python here so that if it's not in the
# path when ninja is run later, python will still be found.
setting = os.path.dirname(sys.executable) + os.pathsep + setting
if envvar in ['include', 'lib']:
# Make sure that the include and lib paths point to directories that
# exist. This ensures a (relatively) clear error message if the
# required SDK is not installed.
for part in setting.split(';'):
if not os.path.exists(part) and len(part) != 0:
raise Exception(
'Path "%s" from environment variable "%s" does not exist. '
'Make sure the necessary SDK is installed.' % (part, envvar))
env[var.upper()] = setting
break
if sys.platform in ('win32', 'cygwin'):
Expand Down Expand Up @@ -175,7 +184,7 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
# Explicitly specifying the SDK version to build with to avoid accidentally
# building with a new and untested SDK. This should stay in sync with the
# packaged toolchain in build/vs_toolchain.py.
args.append('10.0.22621.0')
args.append('10.0.22000.0')
variables = _LoadEnvFromBat(args)
return _ExtractImportantEnvironment(variables)

Expand Down
44 changes: 28 additions & 16 deletions angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ void Renderer11::populateRenderer11DeviceCaps()
&mRenderer11DeviceCaps.B5G6R5maxSamples);
}

if (getFeatures().allowES3OnFL10_0.enabled)
if (getFeatures().allowES3OnFL100.enabled)
{
mRenderer11DeviceCaps.allowES3OnFL10_0 = true;
}
Expand Down Expand Up @@ -1283,7 +1283,7 @@ egl::ConfigSet Renderer11::generateConfigs()
config.transparentBlueValue = 0;
config.optimalOrientation = optimalSurfaceOrientation;
config.colorComponentType = gl_egl::GLComponentTypeToEGLColorComponentType(
colorBufferFormatInfo.componentType);
colorBufferFormatInfo.componentType);

configs.add(config);
}
Expand Down Expand Up @@ -2930,10 +2930,10 @@ angle::Result Renderer11::createRenderTarget(const gl::Context *context,
if (formatInfo.blitSRVFormat != formatInfo.srvFormat)
{
D3D11_SHADER_RESOURCE_VIEW_DESC blitSRVDesc;
blitSRVDesc.Format = formatInfo.blitSRVFormat;
blitSRVDesc.ViewDimension = (supportedSamples == 0)
? D3D11_SRV_DIMENSION_TEXTURE2D
: D3D11_SRV_DIMENSION_TEXTURE2DMS;
blitSRVDesc.Format = formatInfo.blitSRVFormat;
blitSRVDesc.ViewDimension = (supportedSamples == 0)
? D3D11_SRV_DIMENSION_TEXTURE2D
: D3D11_SRV_DIMENSION_TEXTURE2DMS;
blitSRVDesc.Texture2D.MostDetailedMip = 0;
blitSRVDesc.Texture2D.MipLevels = 1;

Expand All @@ -2949,9 +2949,9 @@ angle::Result Renderer11::createRenderTarget(const gl::Context *context,
if (bindDSV)
{
D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
dsvDesc.Format = formatInfo.dsvFormat;
dsvDesc.ViewDimension = (supportedSamples == 0) ? D3D11_DSV_DIMENSION_TEXTURE2D
: D3D11_DSV_DIMENSION_TEXTURE2DMS;
dsvDesc.Format = formatInfo.dsvFormat;
dsvDesc.ViewDimension = (supportedSamples == 0) ? D3D11_DSV_DIMENSION_TEXTURE2D
: D3D11_DSV_DIMENSION_TEXTURE2DMS;
dsvDesc.Texture2D.MipSlice = 0;
dsvDesc.Flags = 0;

Expand All @@ -2965,9 +2965,9 @@ angle::Result Renderer11::createRenderTarget(const gl::Context *context,
else if (bindRTV)
{
D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
rtvDesc.Format = formatInfo.rtvFormat;
rtvDesc.ViewDimension = (supportedSamples == 0) ? D3D11_RTV_DIMENSION_TEXTURE2D
: D3D11_RTV_DIMENSION_TEXTURE2DMS;
rtvDesc.Format = formatInfo.rtvFormat;
rtvDesc.ViewDimension = (supportedSamples == 0) ? D3D11_RTV_DIMENSION_TEXTURE2D
: D3D11_RTV_DIMENSION_TEXTURE2DMS;
rtvDesc.Texture2D.MipSlice = 0;

d3d11::RenderTargetView rtv;
Expand Down Expand Up @@ -3572,6 +3572,8 @@ angle::Result Renderer11::packPixels(const gl::Context *context,
angle::Result Renderer11::blitRenderbufferRect(const gl::Context *context,
const gl::Rectangle &readRectIn,
const gl::Rectangle &drawRectIn,
UINT readLayer,
UINT drawLayer,
RenderTargetD3D *readRenderTarget,
RenderTargetD3D *drawRenderTarget,
GLenum filter,
Expand Down Expand Up @@ -3757,14 +3759,15 @@ angle::Result Renderer11::blitRenderbufferRect(const gl::Context *context,
{
UINT dstX = drawRect.x;
UINT dstY = drawRect.y;
UINT dstZ = drawLayer;

D3D11_BOX readBox;
readBox.left = readRect.x;
readBox.right = readRect.x + readRect.width;
readBox.top = readRect.y;
readBox.bottom = readRect.y + readRect.height;
readBox.front = 0;
readBox.back = 1;
readBox.front = readLayer;
readBox.back = readLayer + 1;

if (scissorNeeded)
{
Expand Down Expand Up @@ -3794,9 +3797,9 @@ angle::Result Renderer11::blitRenderbufferRect(const gl::Context *context,

// D3D11 needs depth-stencil CopySubresourceRegions to have a NULL pSrcBox
// We also require complete framebuffer copies for depth-stencil blit.
D3D11_BOX *pSrcBox = wholeBufferCopy ? nullptr : &readBox;
D3D11_BOX *pSrcBox = wholeBufferCopy && readLayer == 0 ? nullptr : &readBox;

mDeviceContext->CopySubresourceRegion(drawTexture.get(), drawSubresource, dstX, dstY, 0,
mDeviceContext->CopySubresourceRegion(drawTexture.get(), drawSubresource, dstX, dstY, dstZ,
readTexture.get(), readSubresource, pSrcBox);
}
else
Expand Down Expand Up @@ -4040,6 +4043,15 @@ void Renderer11::initializeFeatures(angle::FeaturesD3D *features) const
ApplyFeatureOverrides(features, mDisplay->getState());
}

void Renderer11::initializeFrontendFeatures(angle::FrontendFeatures *features) const
{
if (!mDisplay->getState().featuresAllDisabled)
{
d3d11::InitializeFrontendFeatures(mAdapterDescription, features);
}
ApplyFeatureOverrides(features, mDisplay->getState());
}

DeviceImpl *Renderer11::createEGLDevice()
{
return new DeviceD3D(EGL_D3D11_DEVICE_ANGLE, mDevice);
Expand Down

0 comments on commit feef417

Please sign in to comment.