LibWeb/WebGL2: Implement getUniformIndices

Author: Lubrsi

Libraries/LibWeb/WebGL/WebGL2RenderingContextBase.idl

@@ -418,7 +418,7 @@ interface mixin WebGL2RenderingContextBase {
     undefined bindBufferBase(GLenum target, GLuint index, WebGLBuffer? buffer);
     undefined bindBufferRange(GLenum target, GLuint index, WebGLBuffer? buffer, GLintptr offset, GLsizeiptr size);
     [FIXME] any getIndexedParameter(GLenum target, GLuint index);
-    [FIXME] sequence<GLuint>? getUniformIndices(WebGLProgram program, sequence<DOMString> uniformNames);
+    sequence<GLuint>? getUniformIndices(WebGLProgram program, sequence<DOMString> uniformNames);
     any getActiveUniforms(WebGLProgram program, sequence<GLuint> uniformIndices, GLenum pname);
     GLuint getUniformBlockIndex(WebGLProgram program, DOMString uniformBlockName);
     any getActiveUniformBlockParameter(WebGLProgram program, GLuint uniformBlockIndex, GLenum pname);

Libraries/LibWeb/WebGL/WebGL2RenderingContextImpl.cpp

@@ -1035,6 +1035,36 @@ void WebGL2RenderingContextImpl::bind_buffer_range(WebIDL::UnsignedLong target,
     glBindBufferRange(target, index, buffer_handle, offset, size);
 }
 
+Optional<Vector<WebIDL::UnsignedLong>> WebGL2RenderingContextImpl::get_uniform_indices(GC::Root<WebGLProgram> program, Vector<String> const& uniform_names)
+{
+    m_context->make_current();
+
+    auto handle_or_error = program->handle(this);
+    if (handle_or_error.is_error()) {
+        set_error(GL_INVALID_OPERATION);
+        return OptionalNone {};
+    }
+
+    auto program_handle = handle_or_error.release_value();
+
+    Vector<Vector<GLchar>> uniform_names_strings;
+    uniform_names_strings.ensure_capacity(uniform_names.size());
+    for (auto const& uniform_name : uniform_names) {
+        uniform_names_strings.unchecked_append(null_terminated_string(uniform_name));
+    }
+
+    Vector<GLchar const*> uniform_names_characters;
+    uniform_names_characters.ensure_capacity(uniform_names_strings.size());
+    for (auto const& uniform_name_string : uniform_names_strings) {
+        uniform_names_characters.unchecked_append(uniform_name_string.data());
+    }
+
+    auto result_buffer = MUST(ByteBuffer::create_zeroed(uniform_names_characters.size() * sizeof(WebIDL::UnsignedLong)));
+    auto result_span = result_buffer.bytes().reinterpret<WebIDL::UnsignedLong>();
+    glGetUniformIndices(program_handle, uniform_names_characters.size(), uniform_names_characters.data(), result_span.data());
+    return Vector<WebIDL::UnsignedLong> { result_span };
+}
+
 JS::Value WebGL2RenderingContextImpl::get_active_uniforms(GC::Root<WebGLProgram> program, Vector<WebIDL::UnsignedLong> uniform_indices, WebIDL::UnsignedLong pname)
 {
     m_context->make_current();

Libraries/LibWeb/WebGL/WebGL2RenderingContextImpl.h

@@ -90,6 +90,7 @@ class WebGL2RenderingContextImpl : public WebGLRenderingContextImpl {
     void resume_transform_feedback();
     void bind_buffer_base(WebIDL::UnsignedLong target, WebIDL::UnsignedLong index, GC::Root<WebGLBuffer> buffer);
     void bind_buffer_range(WebIDL::UnsignedLong target, WebIDL::UnsignedLong index, GC::Root<WebGLBuffer> buffer, WebIDL::LongLong offset, WebIDL::LongLong size);
+    Optional<Vector<WebIDL::UnsignedLong>> get_uniform_indices(GC::Root<WebGLProgram> program, Vector<String> const& uniform_names);
     JS::Value get_active_uniforms(GC::Root<WebGLProgram> program, Vector<WebIDL::UnsignedLong> uniform_indices, WebIDL::UnsignedLong pname);
     WebIDL::UnsignedLong get_uniform_block_index(GC::Root<WebGLProgram> program, String uniform_block_name);
     JS::Value get_active_uniform_block_parameter(GC::Root<WebGLProgram> program, WebIDL::UnsignedLong uniform_block_index, WebIDL::UnsignedLong pname);