Hash :
e4859ae5
Author :
Date :
2020-01-27T15:21:58
Fix re-enabling ARB_texture_rectangle My earlier change https://crrev.com/c/1991969 had a bug. If ARB_texture_rectangle is disabled once, it can't be re-enabled because the extension behavior entry is deleted. ResetExtensionBehavior needs to restore it. Bug: angleproject:3770 Change-Id: Icf96acece8ea8d17287c8d09fb4849b61c9c2a36 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2023398 Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: James Darpinian <jdarpinian@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
//
// Copyright 2002 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "compiler/translator/Initialize.h"
namespace sh
{
void InitExtensionBehavior(const ShBuiltInResources &resources, TExtensionBehavior &extBehavior)
{
if (resources.OES_standard_derivatives)
{
extBehavior[TExtension::OES_standard_derivatives] = EBhUndefined;
}
if (resources.OES_EGL_image_external)
{
extBehavior[TExtension::OES_EGL_image_external] = EBhUndefined;
}
if (resources.OES_EGL_image_external_essl3)
{
extBehavior[TExtension::OES_EGL_image_external_essl3] = EBhUndefined;
}
if (resources.NV_EGL_stream_consumer_external)
{
extBehavior[TExtension::NV_EGL_stream_consumer_external] = EBhUndefined;
}
if (resources.ARB_texture_rectangle)
{
// Special: ARB_texture_rectangle extension does not follow the standard for #extension
// directives - it is enabled by default. An extension directive may still disable it.
extBehavior[TExtension::ARB_texture_rectangle] = EBhEnable;
}
if (resources.EXT_blend_func_extended)
{
extBehavior[TExtension::EXT_blend_func_extended] = EBhUndefined;
}
if (resources.EXT_draw_buffers)
{
extBehavior[TExtension::EXT_draw_buffers] = EBhUndefined;
}
if (resources.EXT_frag_depth)
{
extBehavior[TExtension::EXT_frag_depth] = EBhUndefined;
}
if (resources.EXT_shader_texture_lod)
{
extBehavior[TExtension::EXT_shader_texture_lod] = EBhUndefined;
}
if (resources.EXT_shader_framebuffer_fetch)
{
extBehavior[TExtension::EXT_shader_framebuffer_fetch] = EBhUndefined;
}
if (resources.NV_shader_framebuffer_fetch)
{
extBehavior[TExtension::NV_shader_framebuffer_fetch] = EBhUndefined;
}
if (resources.ARM_shader_framebuffer_fetch)
{
extBehavior[TExtension::ARM_shader_framebuffer_fetch] = EBhUndefined;
}
if (resources.OVR_multiview)
{
extBehavior[TExtension::OVR_multiview] = EBhUndefined;
}
if (resources.OVR_multiview2)
{
extBehavior[TExtension::OVR_multiview2] = EBhUndefined;
}
if (resources.EXT_YUV_target)
{
extBehavior[TExtension::EXT_YUV_target] = EBhUndefined;
}
if (resources.EXT_geometry_shader)
{
extBehavior[TExtension::EXT_geometry_shader] = EBhUndefined;
}
if (resources.EXT_gpu_shader5)
{
extBehavior[TExtension::EXT_gpu_shader5] = EBhUndefined;
}
if (resources.OES_texture_storage_multisample_2d_array)
{
extBehavior[TExtension::OES_texture_storage_multisample_2d_array] = EBhUndefined;
}
if (resources.OES_texture_3D)
{
extBehavior[TExtension::OES_texture_3D] = EBhUndefined;
}
if (resources.ANGLE_texture_multisample)
{
extBehavior[TExtension::ANGLE_texture_multisample] = EBhUndefined;
}
if (resources.ANGLE_multi_draw)
{
extBehavior[TExtension::ANGLE_multi_draw] = EBhUndefined;
}
if (resources.ANGLE_base_vertex_base_instance)
{
extBehavior[TExtension::ANGLE_base_vertex_base_instance] = EBhUndefined;
}
if (resources.WEBGL_video_texture)
{
extBehavior[TExtension::WEBGL_video_texture] = EBhUndefined;
}
}
void ResetExtensionBehavior(const ShBuiltInResources &resources,
TExtensionBehavior &extBehavior,
const ShCompileOptions compileOptions)
{
for (auto &ext : extBehavior)
{
ext.second = EBhUndefined;
}
if (resources.ARB_texture_rectangle)
{
if (compileOptions & SH_DISABLE_ARB_TEXTURE_RECTANGLE)
{
// Remove ARB_texture_rectangle so it can't be enabled by extension directives.
extBehavior.erase(TExtension::ARB_texture_rectangle);
}
else
{
// Restore ARB_texture_rectangle in case it was removed during an earlier reset. As
// noted above, it doesn't follow the standard for extension directives and is enabled
// by default.
extBehavior[TExtension::ARB_texture_rectangle] = EBhEnable;
}
}
}
} // namespace sh