Merge lp:~vanvugt/mir/remove-generate_id into lp:mir

[Daniel van Vugt]

Remove needless member function Texture::generate_id()

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4090
https://mir-jenkins.ubuntu.com/job/mir-ci/3175/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4266
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4353
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4343
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4343
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4343
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4293/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4293/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4293/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4293/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4293/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4293
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4293/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3175/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'src/gl/texture.cpp'
--- src/gl/texture.cpp	2016-01-29 08:18:22 +0000
+++ src/gl/texture.cpp	2017-03-16 04:37:08 +0000
@@ -20,6 +20,18 @@
 
 namespace mgl = mir::gl;
 
+namespace
+{
+
+GLuint generate_id()
+{
+    GLuint id;
+    glGenTextures(1, &id);
+    return id;
+}
+
+} // namespace
+
 mgl::Texture::Texture() :
     id(generate_id())
 {
@@ -41,10 +53,3 @@
 {
     glDeleteTextures(1, &id);
 }
-
-GLuint mgl::Texture::generate_id() const
-{
-    GLuint id;
-    glGenTextures(1, &id);
-    return id;
-}

=== modified file 'src/include/gl/mir/gl/texture.h'
--- src/include/gl/mir/gl/texture.h	2017-01-18 02:29:37 +0000
+++ src/include/gl/mir/gl/texture.h	2017-03-16 04:37:08 +0000
@@ -35,7 +35,6 @@
 private:
     Texture(Texture const&) = delete;
     Texture& operator=(Texture const&) = delete;
-    GLuint generate_id() const;
     GLuint const id;
 };
 }