Remove unused code.
This commit is contained in:
@@ -9,27 +9,6 @@
|
|||||||
using namespace fmri;
|
using namespace fmri;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
/**
|
|
||||||
* Utility function to send OpenGL info dumps to the log
|
|
||||||
*
|
|
||||||
* @param object The GLObject to get info for
|
|
||||||
* @param glGet__iv The function to query log length with
|
|
||||||
* @param glGet__InfoLog The function to get the log with
|
|
||||||
*/
|
|
||||||
static void show_info_log(
|
|
||||||
GLuint object,
|
|
||||||
PFNGLGETSHADERIVPROC glGet__iv,
|
|
||||||
PFNGLGETSHADERINFOLOGPROC glGet__InfoLog
|
|
||||||
)
|
|
||||||
{
|
|
||||||
GLint log_length;
|
|
||||||
glGet__iv(object, GL_INFO_LOG_LENGTH, &log_length);
|
|
||||||
unique_ptr<char[]> log(new char[log_length]);
|
|
||||||
glGet__InfoLog(object, log_length, nullptr, log.get());
|
|
||||||
|
|
||||||
LOG(INFO) << log.get() << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLuint fmri::loadTexture(DType const *data, int width, int height)
|
GLuint fmri::loadTexture(DType const *data, int width, int height)
|
||||||
{
|
{
|
||||||
// Load and scale texture
|
// Load and scale texture
|
||||||
@@ -85,24 +64,6 @@ void fmri::changeWindowSize(int w, int h)
|
|||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
}
|
}
|
||||||
|
|
||||||
GLuint fmri::compileShader(GLenum type, char const *source)
|
|
||||||
{
|
|
||||||
GLuint shader = glCreateShader(type);
|
|
||||||
auto length = static_cast<GLint>(strlen(source));
|
|
||||||
GLint compileOK;
|
|
||||||
|
|
||||||
glShaderSource(shader, 1, &source, &length);
|
|
||||||
glCompileShader(shader);
|
|
||||||
|
|
||||||
glGetShaderiv(shader, GL_COMPILE_STATUS, &compileOK);
|
|
||||||
if (!compileOK) {
|
|
||||||
LOG(WARNING) << "Failed to compile " << source << endl;
|
|
||||||
show_info_log(shader, glGetShaderiv, glGetShaderInfoLog);
|
|
||||||
glDeleteShader(shader);
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void fmri::renderText(std::string_view text)
|
void fmri::renderText(std::string_view text)
|
||||||
{
|
{
|
||||||
constexpr auto font = GLUT_BITMAP_HELVETICA_10;
|
constexpr auto font = GLUT_BITMAP_HELVETICA_10;
|
||||||
|
|||||||
@@ -16,14 +16,6 @@ namespace fmri {
|
|||||||
*/
|
*/
|
||||||
GLuint loadTexture(DType const * data, int width, int height);
|
GLuint loadTexture(DType const * data, int width, int height);
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param type
|
|
||||||
* @param source
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
GLuint compileShader(GLenum type, char const * source);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback handler to handle resizing windows.
|
* Callback handler to handle resizing windows.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user