language-servers/mcshader-lsp
1
0
Fork 0
mirror of https://github.com/Strum355/mcshader-lsp.git synced 2025-08-04 00:49:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

geometry shader support apparently? idfk

Browse source
This commit is contained in:
Noah Santschi-Cooney 2021-01-25 23:20:27 +00:00
parent dd827a3787
commit 19f92baba9
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
2 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/src/main.rs
View file

@ -109,7 +109,7 @@ impl Display for IncludePosition {
}
pub enum TreeType {
Fragment, Vertex
Fragment, Vertex, Geometry
}
impl Into<&'static str> for TreeType {
@ -296,6 +296,8 @@ impl MinecraftShaderLanguageServer {
TreeType::Fragment
} else if root_path.ends_with(".vsh") {
TreeType::Vertex
} else if root_path.ends_with(".gsh") {
TreeType::Geometry
} else {
eprintln!("got a non fsh|vsh as a file root ancestor: {}", root_path);
back_fill(&all_sources, &mut diagnostics);
@ -328,6 +330,8 @@ impl MinecraftShaderLanguageServer {
TreeType::Fragment
} else if root_path.ends_with(".vsh") {
TreeType::Vertex
} else if root_path.ends_with(".gsh") {
TreeType::Geometry
} else {
eprintln!("got a non fsh|vsh as a file root ancestor: {}", root_path);
continue;

67
server/src/opengl.rs
View file

@ -35,57 +35,48 @@ impl OpenGLContext {
_ctx: gl_window,
}
}
unsafe fn compile_and_get_shader_log(&self, shader: gl::types::GLuint, source: String) -> Option<String> {
let mut success = i32::from(gl::FALSE);
let c_str_frag = CString::new(source).unwrap();
gl::ShaderSource(shader, 1, &c_str_frag.as_ptr(), ptr::null());
gl::CompileShader(shader);
// Check for shader compilation errors
gl::GetShaderiv(shader, gl::COMPILE_STATUS, &mut success);
let result = if success != i32::from(gl::TRUE) {
let mut info_len: gl::types::GLint = 0;
gl::GetShaderiv(shader, gl::INFO_LOG_LENGTH, &mut info_len);
let mut info = vec![0u8; info_len as usize];
gl::GetShaderInfoLog(shader, info_len as gl::types::GLsizei, ptr::null_mut(), info.as_mut_ptr() as *mut gl::types::GLchar);
info.set_len((info_len - 1) as usize); // ignore null for str::from_utf8
Some(String::from_utf8(info).unwrap())
} else {
None
};
gl::DeleteShader(shader);
result
}
}
impl ShaderValidator for OpenGLContext {
fn validate(&self, tree_type: super::TreeType, source: String) -> Option<String> {
unsafe {
let mut success = i32::from(gl::FALSE);
match tree_type {
crate::TreeType::Fragment => {
// Fragment shader
let fragment_shader = gl::CreateShader(gl::FRAGMENT_SHADER);
let c_str_frag = CString::new(source).unwrap();
gl::ShaderSource(fragment_shader, 1, &c_str_frag.as_ptr(), ptr::null());
gl::CompileShader(fragment_shader);
// Check for shader compilation errors
gl::GetShaderiv(fragment_shader, gl::COMPILE_STATUS, &mut success);
let result = if success != i32::from(gl::TRUE) {
let mut info_len: gl::types::GLint = 0;
gl::GetShaderiv(fragment_shader, gl::INFO_LOG_LENGTH, &mut info_len);
let mut info = vec![0u8; info_len as usize];
gl::GetShaderInfoLog(fragment_shader, info_len as gl::types::GLsizei, ptr::null_mut(), info.as_mut_ptr() as *mut gl::types::GLchar);
info.set_len((info_len - 1) as usize); // ignore null for str::from_utf8
Some(String::from_utf8(info).unwrap())
} else {
None
};
gl::DeleteShader(fragment_shader);
result
self.compile_and_get_shader_log(fragment_shader, source)
}
crate::TreeType::Vertex => {
// Vertex shader
let vertex_shader = gl::CreateShader(gl::VERTEX_SHADER);
let c_str_vert = CString::new(source).unwrap();
gl::ShaderSource(vertex_shader, 1, &c_str_vert.as_ptr(), ptr::null());
gl::CompileShader(vertex_shader);
// Check for shader compilation errors
gl::GetShaderiv(vertex_shader, gl::COMPILE_STATUS, &mut success);
let result = if success != i32::from(gl::TRUE) {
let mut info_len: gl::types::GLint = 0;
gl::GetShaderiv(vertex_shader, gl::INFO_LOG_LENGTH, &mut info_len);
let mut info = vec![0u8; info_len as usize];
gl::GetShaderInfoLog(vertex_shader, info_len as gl::types::GLsizei, ptr::null_mut(), info.as_mut_ptr() as *mut gl::types::GLchar);
info.set_len((info_len - 1) as usize); // ignore null for str::from_utf8
Some(String::from_utf8(info).unwrap())
} else {
None
};
gl::DeleteShader(vertex_shader);
result
self.compile_and_get_shader_log(vertex_shader, source)
}
crate::TreeType::Geometry => {
// Geometry shader
let geometry_shader = gl::CreateShader(gl::GEOMETRY_SHADER);
self.compile_and_get_shader_log(geometry_shader, source)
}
}
}