Browse Source

add support for glsl shaders closes #439

pipelines/235045657
Jørgen Lien Sellæg 5 years ago
parent
commit
a89a965a80
  1. 14
      docs/language_servers.md
  2. 7
      src/source.cpp
  3. 2
      src/source_base.cpp

14
docs/language_servers.md

@ -78,3 +78,17 @@ ln -s ~/.cargo/bin/rust-analyzer /usr/local/bin/rust-language-server
* Additional setup within a Rust project: * Additional setup within a Rust project:
* Add an empty `.rust-format` file to enable style format on save * Add an empty `.rust-format` file to enable style format on save
## GLSL
Install language server, and create a script to enable server in juCi++:
```sh
git clone https://github.com/svenstaro/glsl-language-server --recursive
cd glsl-language-server
mkdir build
cd build
cmake ..
make
# usually as root:
make install
echo "/usr/local/bin/glslls --stdin" > /usr/local/bin/glsl-language-server
```

7
src/source.cpp

@ -66,6 +66,13 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
language = language_manager->get_language("cpphdr"); language = language_manager->get_language("cpphdr");
else if(file_path.extension() == ".ts" || file_path.extension() == ".tsx" || file_path.extension() == ".jsx" || file_path.extension() == ".flow") else if(file_path.extension() == ".ts" || file_path.extension() == ".tsx" || file_path.extension() == ".jsx" || file_path.extension() == ".flow")
language = language_manager->get_language("js"); language = language_manager->get_language("js");
else if(file_path.extension() == ".vert" || // listed on https://github.com/KhronosGroup/glslang
file_path.extension() == ".frag" ||
file_path.extension() == ".tesc" ||
file_path.extension() == ".tese" ||
file_path.extension() == ".geom" ||
file_path.extension() == ".comp")
language = language_manager->get_language("glsl");
else if(!file_path.has_extension()) { else if(!file_path.has_extension()) {
for(auto &part : file_path) { for(auto &part : file_path) {
if(part == "include") { if(part == "include") {

2
src/source_base.cpp

@ -160,7 +160,7 @@ Source::BaseView::BaseView(const boost::filesystem::path &file_path, const Glib:
language_id == "c-sharp" || language_id == "html" || language_id == "cuda" || language_id == "c-sharp" || language_id == "html" || language_id == "cuda" ||
language_id == "php" || language_id == "rust" || language_id == "swift" || language_id == "php" || language_id == "rust" || language_id == "swift" ||
language_id == "go" || language_id == "scala" || language_id == "opencl" || language_id == "go" || language_id == "scala" || language_id == "opencl" ||
language_id == "json" || language_id == "css") language_id == "json" || language_id == "css" || language_id == "glsl")
is_bracket_language = true; is_bracket_language = true;
} }

Loading…
Cancel
Save