Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass more GL limits to the ANGLE shader compiler

Browse source
This commit is contained in:
Anthony Ramine 2018-07-07 19:04:39 +02:00
parent 83aaf9a0e0
commit 0e93f06d8d
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/webglrenderingcontext.rs
View file

@ -2021,7 +2021,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
fn CompileShader(&self, shader: &WebGLShader) { fn CompileShader(&self, shader: &WebGLShader) {
handle_potential_webgl_error!( handle_potential_webgl_error!(
self, self,
shader.compile(self.webgl_version, self.glsl_version, &self.extension_manager) shader.compile(
self.webgl_version,
self.glsl_version,
&self.limits,
&self.extension_manager,
)
) )
} }

20
components/script/dom/webglshader.rs
View file

@ -18,7 +18,9 @@ use dom::webglobject::WebGLObject;
use dom::window::Window; use dom::window::Window;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use mozangle::shaders::{BuiltInResources, Output, ShaderValidator}; use mozangle::shaders::{BuiltInResources, Output, ShaderValidator};
use offscreen_gl_context::GLLimits;
use std::cell::Cell; use std::cell::Cell;
use std::os::raw::c_int;
use std::sync::{ONCE_INIT, Once}; use std::sync::{ONCE_INIT, Once};
#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)] #[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)]
@ -100,6 +102,7 @@ impl WebGLShader {
&self, &self,
webgl_version: WebGLVersion, webgl_version: WebGLVersion,
glsl_version: WebGLSLVersion, glsl_version: WebGLSLVersion,
limits: &GLLimits,
ext: &WebGLExtensions, ext: &WebGLExtensions,
) -> WebGLResult<()> { ) -> WebGLResult<()> {
if self.is_deleted.get() && !self.is_attached() { if self.is_deleted.get() && !self.is_attached() {
@ -115,10 +118,19 @@ impl WebGLShader {
None => return Ok(()), None => return Ok(()),
}; };
let mut params = BuiltInResources::default(); let params = BuiltInResources {
params.FragmentPrecisionHigh = 1; MaxVertexAttribs: limits.max_vertex_attribs as c_int,
params.OES_standard_derivatives = ext.is_enabled::<OESStandardDerivatives>() as i32; MaxVertexUniformVectors: limits.max_vertex_uniform_vectors as c_int,
params.EXT_shader_texture_lod = ext.is_enabled::<EXTShaderTextureLod>() as i32; MaxVaryingVectors: limits.max_varying_vectors as c_int,
MaxVertexTextureImageUnits: limits.max_vertex_texture_image_units as c_int,
MaxCombinedTextureImageUnits: limits.max_combined_texture_image_units as c_int,
MaxTextureImageUnits: limits.max_texture_image_units as c_int,
MaxFragmentUniformVectors: limits.max_fragment_uniform_vectors as c_int,
OES_standard_derivatives: ext.is_enabled::<OESStandardDerivatives>() as c_int,
EXT_shader_texture_lod: ext.is_enabled::<EXTShaderTextureLod>() as c_int,
FragmentPrecisionHigh: 1,
..BuiltInResources::default()
};
let validator = match webgl_version { let validator = match webgl_version {
WebGLVersion::WebGL1 => { WebGLVersion::WebGL1 => {
let output_format = if cfg!(any(target_os = "android", target_os = "ios")) { let output_format = if cfg!(any(target_os = "android", target_os = "ios")) {